diff --git a/.pick_status.json b/.pick_status.json
index 4c166db80c3..063c75cabd8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4702,7 +4702,7 @@
         "description": "radv: add a layer for fixing rendering issues with RAGE2",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c7d0d328d569c15c01c5830af838faac8a8b3c62"
     },
diff --git a/src/amd/vulkan/layers/radv_rage2.c b/src/amd/vulkan/layers/radv_rage2.c
new file mode 100644
index 00000000000..52438db6c26
--- /dev/null
+++ b/src/amd/vulkan/layers/radv_rage2.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2023 Valve Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "radv_private.h"
+#include "vk_framebuffer.h"
+#include "vk_common_entrypoints.h"
+
+VKAPI_ATTR void VKAPI_CALL
+rage2_CmdBeginRenderPass(VkCommandBuffer commandBuffer,
+                         const VkRenderPassBeginInfo* pRenderPassBegin,
+                         VkSubpassContents contents)
+{
+   VK_FROM_HANDLE(vk_framebuffer, framebuffer, pRenderPassBegin->framebuffer);
+
+   VkRenderPassBeginInfo render_pass_begin = {
+      .sType = pRenderPassBegin->sType,
+      .pNext = pRenderPassBegin->pNext,
+      .renderPass = pRenderPassBegin->renderPass,
+      .framebuffer = pRenderPassBegin->framebuffer,
+      .clearValueCount = pRenderPassBegin->clearValueCount,
+      .pClearValues = pRenderPassBegin->pClearValues,
+   };
+
+   /* RAGE2 seems to incorrectly set the render area and with dynamic rendering the concept of
+    * framebuffer dimensions goes away. Forcing the render area to be the framebuffer dimensions
+    * restores previous logic and it fixes rendering issues.
+    */
+   render_pass_begin.renderArea.offset.x = 0;
+   render_pass_begin.renderArea.offset.y = 0;
+   render_pass_begin.renderArea.extent.width = framebuffer->width;
+   render_pass_begin.renderArea.extent.height = framebuffer->height;
+
+   vk_common_CmdBeginRenderPass(commandBuffer, &render_pass_begin, contents);
+}
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index ad75d68b15f..5f714bda774 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -26,7 +26,7 @@ radv_entrypoints = custom_target(
     prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--proto', '--weak',
     '--out-h', '@OUTPUT0@', '--out-c', '@OUTPUT1@', '--prefix', 'radv',
     '--device-prefix', 'sqtt', '--device-prefix', 'metro_exodus',
-    '--device-prefix', 'rra',
+    '--device-prefix', 'rra', '--device-prefix', 'rage2',
   ],
   depend_files : vk_entrypoints_gen_depend_files,
 )
@@ -34,6 +34,7 @@ radv_entrypoints = custom_target(
 libradv_files = files(
   'bvh/bvh.h',
   'layers/radv_metro_exodus.c',
+  'layers/radv_rage2.c',
   'layers/radv_rra_layer.c',
   'layers/radv_sqtt_layer.c',
   'winsys/null/radv_null_bo.c',
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 17a65969b92..eec7833bebd 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -3607,6 +3607,10 @@ radv_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCr
        */
       vk_device_dispatch_table_from_entrypoints(&dispatch_table, &metro_exodus_device_entrypoints, true);
       vk_device_dispatch_table_from_entrypoints(&dispatch_table, &radv_device_entrypoints, false);
+   } else if (physical_device->instance->vk.app_info.app_name &&
+              !strcmp(physical_device->instance->vk.app_info.app_name, "Rage 2")) {
+      vk_device_dispatch_table_from_entrypoints(&dispatch_table, &rage2_device_entrypoints, true);
+      vk_device_dispatch_table_from_entrypoints(&dispatch_table, &radv_device_entrypoints, false);
    } else if (radv_thread_trace_enabled()) {
       vk_device_dispatch_table_from_entrypoints(&dispatch_table, &sqtt_device_entrypoints, true);
       vk_device_dispatch_table_from_entrypoints(&dispatch_table, &radv_device_entrypoints, false);