From 1b342ce4e00cacc0c87f3339cd7696e2ab0e62fe Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Tue, 19 Apr 2022 10:58:17 -0700
Subject: [PATCH] cleanup comma two stuff

---
 SConscript             |  4 +---
 SConstruct             |  3 ---
 visionipc/visionbuf.cc | 19 ++-----------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/SConscript b/SConscript
index ce901e5..e40d3ba 100644
--- a/SConscript
+++ b/SConscript
@@ -49,7 +49,7 @@ vipc_sources = [
   'visionipc/visionbuf.cc',
 ]
 
-if arch in ["aarch64", "larch64"]:
+if arch == "larch64":
   vipc_sources += ['visionipc/visionbuf_ion.cc']
 else:
   vipc_sources += ['visionipc/visionbuf_cl.cc']
@@ -63,8 +63,6 @@ vipc_libs = envCython["LIBS"] + [vipc, messaging_lib, common, "zmq"]
 if arch == "Darwin":
   vipc_frameworks.append('OpenCL')
 else:
-  if arch == "aarch64":
-    vipc_libs.append('adreno_utils')
   vipc_libs.append('OpenCL')
 envCython.Program('visionipc/visionipc_pyx.so', 'visionipc/visionipc_pyx.pyx',
                   LIBS=vipc_libs, FRAMEWORKS=vipc_frameworks)
diff --git a/SConstruct b/SConstruct
index 06d8d96..bc98b6d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -65,9 +65,6 @@ envCython["CPPPATH"] += [np.get_include()]
 envCython["CCFLAGS"] += ["-Wno-#warnings", "-Wno-shadow", "-Wno-deprecated-declarations"]
 if arch == "Darwin":
   envCython["LINKFLAGS"] = ["-bundle", "-undefined", "dynamic_lookup"]
-elif arch == "aarch64":
-  envCython["LINKFLAGS"] = ["-shared"]
-  envCython["LIBS"] = [os.path.basename(sysconfig.get_paths()['include'])]
 else:
   envCython["LINKFLAGS"] = ["-pthread", "-shared"]
 
diff --git a/visionipc/visionbuf.cc b/visionipc/visionbuf.cc
index e94a8bb..276b4fb 100644
--- a/visionipc/visionbuf.cc
+++ b/visionipc/visionbuf.cc
@@ -2,24 +2,9 @@
 
 #define ALIGN(x, align) (((x) + (align)-1) & ~((align)-1))
 
-#ifdef QCOM
-// from libadreno_utils.so
-extern "C" void compute_aligned_width_and_height(int width,
-                                                 int height,
-                                                 int bpp,
-                                                 int tile_mode,
-                                                 int raster_mode,
-                                                 int padding_threshold,
-                                                 int *aligned_w,
-                                                 int *aligned_h);
-#endif
-
 void visionbuf_compute_aligned_width_and_height(int width, int height, int *aligned_w, int *aligned_h) {
-#ifdef QCOM
-  compute_aligned_width_and_height(ALIGN(width, 32), ALIGN(height, 32), 3, 0, 0, 512, aligned_w, aligned_h);
-#else
-  *aligned_w = width; *aligned_h = height;
-#endif
+  *aligned_w = width;
+  *aligned_h = height;
 }
 
 void VisionBuf::init_rgb(size_t init_width, size_t init_height, size_t init_stride) {