Merge pull request #326 from fewtarius/dev

Revert.
This commit is contained in:
fewtarius 2022-08-06 19:44:07 -04:00 committed by GitHub
commit 4805de4117
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 52 deletions

View file

@ -1,52 +0,0 @@
diff --git a/core/NormalRga.h b/core/NormalRga.h
index 9ac6ee8..e04eef5 100755
--- a/core/NormalRga.h
+++ b/core/NormalRga.h
@@ -41,7 +41,7 @@
#include <hardware/hardware.h>
#endif
-#include "drmrga.h"
+#include "rga/drmrga.h"
#include "rga.h"
#include "NormalRgaContext.h"
diff --git a/include/GrallocOps.h b/include/GrallocOps.h
index 97e92d4..eed4e29 100755
--- a/include/GrallocOps.h
+++ b/include/GrallocOps.h
@@ -45,7 +45,7 @@
#include <utils/Log.h>
#include <log/log_main.h>
-#include "drmrga.h"
+#include "rga/drmrga.h"
#include "rga.h"
// -------------------------------------------------------------------------------
diff --git a/include/RgaApi.h b/include/RgaApi.h
index b0049f7..0440de0 100755
--- a/include/RgaApi.h
+++ b/include/RgaApi.h
@@ -30,7 +30,7 @@
#include <sys/mman.h>
#include <linux/stddef.h>
-#include "drmrga.h"
+#include "rga/drmrga.h"
#include "rga.h"
#ifdef __cplusplus
diff --git a/include/RockchipRga.h b/include/RockchipRga.h
index 082f9e1..4aca7f1 100755
--- a/include/RockchipRga.h
+++ b/include/RockchipRga.h
@@ -30,7 +30,7 @@
#include <sys/mman.h>
#include <linux/stddef.h>
-#include "drmrga.h"
+#include "rga/drmrga.h"
#include "GrallocOps.h"
#include "RgaUtils.h"
#include "rga.h"

View file

@ -0,0 +1,12 @@
diff -rupN retroarch.orig/gfx/drivers/oga_gfx.c retroarch/gfx/drivers/oga_gfx.c
--- retroarch.orig/gfx/drivers/oga_gfx.c 2022-02-28 19:40:46.222185295 -0500
+++ retroarch/gfx/drivers/oga_gfx.c 2022-02-28 19:44:14.187909576 -0500
@@ -22,7 +22,7 @@
#include "../../verbosity.h"
#include <fcntl.h>
#include <rga/RgaApi.h>
-#include <rga/RockchipRgaMacro.h>
+#include <rga/drmrga.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
#include <drm/drm_fourcc.h>