From 43a39b197e0a15d6b1d9885da6e34ebdcc7d0565 Mon Sep 17 00:00:00 2001
From: water <awaterford111445@gmail.com>
Date: Thu, 12 Aug 2021 19:33:47 -0400
Subject: [PATCH] fix merge

---
 decompiler/config/jak1_ntsc_black_label/type_casts.jsonc | 3 ++-
 game/graphics/opengl_renderer/DirectRenderer.h           | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc
index 932c8fae24..cdaa684144 100644
--- a/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc
+++ b/decompiler/config/jak1_ntsc_black_label/type_casts.jsonc
@@ -1862,7 +1862,8 @@
     [[40, 43], "a0", "dma-packet"],
     [[63, 69], "a0", "dma-packet"],
     [[78, 79], "a0", "dma-packet"],
-    [7
+    [79, "a0", "(pointer uint64)"]
+  ],
   "(anon-function 6 water-anim)": [
     [6, "a0", "vector"]
   ],
diff --git a/game/graphics/opengl_renderer/DirectRenderer.h b/game/graphics/opengl_renderer/DirectRenderer.h
index b9848cb758..7db4ecb19f 100644
--- a/game/graphics/opengl_renderer/DirectRenderer.h
+++ b/game/graphics/opengl_renderer/DirectRenderer.h
@@ -3,7 +3,6 @@
 #include <vector>
 #include "game/graphics/opengl_renderer/BucketRenderer.h"
 #include "game/graphics/dma/gs.h"
-#include "game/graphics/types.h"
 #include "common/math/Vector.h"
 #include "common/util/SmallVector.h"
 #include "game/graphics/pipelines/opengl.h"