From d8bb563546ae56f694817b5d090d1f28e4a49dba Mon Sep 17 00:00:00 2001 From: plutooo Date: Tue, 20 Feb 2018 06:59:05 +0100 Subject: [PATCH] Renamed gfx/ to display/ --- nx/Makefile | 2 +- nx/include/switch.h | 14 +++++++------- nx/include/switch/{gfx => display}/binder.h | 0 .../switch/{gfx => display}/buffer_producer.h | 2 +- nx/include/switch/{gfx => display}/gfx.h | 0 nx/include/switch/{gfx => display}/ioctl.h | 0 nx/include/switch/{gfx => display}/nvgfx.h | 0 nx/include/switch/{gfx => display}/nvioctl.h | 0 nx/include/switch/{gfx => display}/parcel.h | 2 +- nx/source/{gfx => display}/binder.c | 2 +- nx/source/{gfx => display}/buffer_producer.c | 4 ++-- nx/source/{gfx => display}/gfx.c | 8 ++++---- nx/source/{gfx => display}/ioctl/channel.c | 4 ++-- nx/source/{gfx => display}/ioctl/nvhost-as-gpu.c | 4 ++-- nx/source/{gfx => display}/ioctl/nvhost-ctrl-gpu.c | 4 ++-- nx/source/{gfx => display}/ioctl/nvhost-ctrl.c | 4 ++-- nx/source/{gfx => display}/ioctl/nvmap.c | 4 ++-- nx/source/{gfx => display}/nvgfx.c | 8 ++++---- nx/source/{gfx => display}/parcel.c | 2 +- nx/source/runtime/devices/console.c | 2 +- nx/source/services/nv.c | 2 +- 21 files changed, 34 insertions(+), 34 deletions(-) rename nx/include/switch/{gfx => display}/binder.h (100%) rename nx/include/switch/{gfx => display}/buffer_producer.h (99%) rename nx/include/switch/{gfx => display}/gfx.h (100%) rename nx/include/switch/{gfx => display}/ioctl.h (100%) rename nx/include/switch/{gfx => display}/nvgfx.h (100%) rename nx/include/switch/{gfx => display}/nvioctl.h (100%) rename nx/include/switch/{gfx => display}/parcel.h (96%) rename nx/source/{gfx => display}/binder.c (99%) rename nx/source/{gfx => display}/buffer_producer.c (99%) rename nx/source/{gfx => display}/gfx.c (99%) rename nx/source/{gfx => display}/ioctl/channel.c (98%) rename nx/source/{gfx => display}/ioctl/nvhost-as-gpu.c (98%) rename nx/source/{gfx => display}/ioctl/nvhost-ctrl-gpu.c (97%) rename nx/source/{gfx => display}/ioctl/nvhost-ctrl.c (95%) rename nx/source/{gfx => display}/ioctl/nvmap.c (96%) rename nx/source/{gfx => display}/nvgfx.c (99%) rename nx/source/{gfx => display}/parcel.c (99%) diff --git a/nx/Makefile b/nx/Makefile index d3abb3c4..6501eb37 100644 --- a/nx/Makefile +++ b/nx/Makefile @@ -24,7 +24,7 @@ VERSION := $(LIBNX_MAJOR).$(LIBNX_MINOR).$(LIBNX_PATCH) #--------------------------------------------------------------------------------- TARGET := nx #BUILD := build -SOURCES := source/arm source/kernel source/services source/gfx source/gfx/ioctl source/audio source/runtime source/runtime/devices source/runtime/util/utf +SOURCES := source/arm source/kernel source/services source/display source/display/ioctl source/audio source/runtime source/runtime/devices source/runtime/util/utf DATA := data INCLUDES := include external/bsd/include diff --git a/nx/include/switch.h b/nx/include/switch.h index 893d02b5..fd6f4742 100644 --- a/nx/include/switch.h +++ b/nx/include/switch.h @@ -65,13 +65,13 @@ extern "C" { #include "switch/services/spl.h" #include "switch/services/ncm.h" -#include "switch/gfx/gfx.h" -#include "switch/gfx/binder.h" -#include "switch/gfx/parcel.h" -#include "switch/gfx/buffer_producer.h" -#include "switch/gfx/ioctl.h" -#include "switch/gfx/nvioctl.h" -#include "switch/gfx/nvgfx.h" +#include "switch/display/gfx.h" +#include "switch/display/binder.h" +#include "switch/display/parcel.h" +#include "switch/display/buffer_producer.h" +#include "switch/display/ioctl.h" +#include "switch/display/nvioctl.h" +#include "switch/display/nvgfx.h" #include "switch/audio/driver.h" diff --git a/nx/include/switch/gfx/binder.h b/nx/include/switch/display/binder.h similarity index 100% rename from nx/include/switch/gfx/binder.h rename to nx/include/switch/display/binder.h diff --git a/nx/include/switch/gfx/buffer_producer.h b/nx/include/switch/display/buffer_producer.h similarity index 99% rename from nx/include/switch/gfx/buffer_producer.h rename to nx/include/switch/display/buffer_producer.h index 97de2f6c..71200c79 100644 --- a/nx/include/switch/gfx/buffer_producer.h +++ b/nx/include/switch/display/buffer_producer.h @@ -1,5 +1,5 @@ #pragma once -#include "../gfx/nvioctl.h" +#include "../display/nvioctl.h" typedef struct { u32 is_valid; diff --git a/nx/include/switch/gfx/gfx.h b/nx/include/switch/display/gfx.h similarity index 100% rename from nx/include/switch/gfx/gfx.h rename to nx/include/switch/display/gfx.h diff --git a/nx/include/switch/gfx/ioctl.h b/nx/include/switch/display/ioctl.h similarity index 100% rename from nx/include/switch/gfx/ioctl.h rename to nx/include/switch/display/ioctl.h diff --git a/nx/include/switch/gfx/nvgfx.h b/nx/include/switch/display/nvgfx.h similarity index 100% rename from nx/include/switch/gfx/nvgfx.h rename to nx/include/switch/display/nvgfx.h diff --git a/nx/include/switch/gfx/nvioctl.h b/nx/include/switch/display/nvioctl.h similarity index 100% rename from nx/include/switch/gfx/nvioctl.h rename to nx/include/switch/display/nvioctl.h diff --git a/nx/include/switch/gfx/parcel.h b/nx/include/switch/display/parcel.h similarity index 96% rename from nx/include/switch/gfx/parcel.h rename to nx/include/switch/display/parcel.h index 4b1b2fd3..2fab1de3 100644 --- a/nx/include/switch/gfx/parcel.h +++ b/nx/include/switch/display/parcel.h @@ -1,6 +1,6 @@ #pragma once #include "../result.h" -#include "../gfx/binder.h" +#include "../display/binder.h" #define PARCEL_MAX_PAYLOAD 0x400 diff --git a/nx/source/gfx/binder.c b/nx/source/display/binder.c similarity index 99% rename from nx/source/gfx/binder.c rename to nx/source/display/binder.c index 957196c8..d82a16e4 100644 --- a/nx/source/gfx/binder.c +++ b/nx/source/display/binder.c @@ -3,7 +3,7 @@ #include "result.h" #include "kernel/ipc.h" #include "kernel/detect.h" -#include "gfx/binder.h" +#include "display/binder.h" void binderCreateSession(Binder *session, Handle sessionHandle, s32 id) { diff --git a/nx/source/gfx/buffer_producer.c b/nx/source/display/buffer_producer.c similarity index 99% rename from nx/source/gfx/buffer_producer.c rename to nx/source/display/buffer_producer.c index 147cf788..915e2cf8 100644 --- a/nx/source/gfx/buffer_producer.c +++ b/nx/source/display/buffer_producer.c @@ -1,8 +1,8 @@ #include #include "types.h" #include "result.h" -#include "gfx/parcel.h" -#include "gfx/buffer_producer.h" +#include "display/parcel.h" +#include "display/buffer_producer.h" // This implements the version of Android IGraphicBufferProducer used by Switch. diff --git a/nx/source/gfx/gfx.c b/nx/source/display/gfx.c similarity index 99% rename from nx/source/gfx/gfx.c rename to nx/source/display/gfx.c index bdd37b5c..31c65bef 100644 --- a/nx/source/gfx/gfx.c +++ b/nx/source/display/gfx.c @@ -7,10 +7,10 @@ #include "services/vi.h" #include "services/applet.h" #include "services/nv.h" -#include "gfx/binder.h" -#include "gfx/buffer_producer.h" -#include "gfx/nvgfx.h" -#include "gfx/gfx.h" +#include "display/binder.h" +#include "display/buffer_producer.h" +#include "display/nvgfx.h" +#include "display/gfx.h" static bool g_gfxInitialized = 0; static ViDisplay g_gfxDisplay; diff --git a/nx/source/gfx/ioctl/channel.c b/nx/source/display/ioctl/channel.c similarity index 98% rename from nx/source/gfx/ioctl/channel.c rename to nx/source/display/ioctl/channel.c index e3ca3792..d958e541 100644 --- a/nx/source/gfx/ioctl/channel.c +++ b/nx/source/display/ioctl/channel.c @@ -2,8 +2,8 @@ #include "types.h" #include "result.h" #include "services/nv.h" -#include "gfx/ioctl.h" -#include "gfx/nvioctl.h" +#include "display/ioctl.h" +#include "display/nvioctl.h" Result nvioctlChannel_SetNvmapFd(u32 fd, u32 nvmap_fd) { struct { diff --git a/nx/source/gfx/ioctl/nvhost-as-gpu.c b/nx/source/display/ioctl/nvhost-as-gpu.c similarity index 98% rename from nx/source/gfx/ioctl/nvhost-as-gpu.c rename to nx/source/display/ioctl/nvhost-as-gpu.c index e19a61cb..90b27150 100644 --- a/nx/source/gfx/ioctl/nvhost-as-gpu.c +++ b/nx/source/display/ioctl/nvhost-as-gpu.c @@ -2,8 +2,8 @@ #include "types.h" #include "result.h" #include "services/nv.h" -#include "gfx/ioctl.h" -#include "gfx/nvioctl.h" +#include "display/ioctl.h" +#include "display/nvioctl.h" Result nvioctlNvhostAsGpu_BindChannel(u32 fd, u32 channel_fd) { struct { diff --git a/nx/source/gfx/ioctl/nvhost-ctrl-gpu.c b/nx/source/display/ioctl/nvhost-ctrl-gpu.c similarity index 97% rename from nx/source/gfx/ioctl/nvhost-ctrl-gpu.c rename to nx/source/display/ioctl/nvhost-ctrl-gpu.c index 59eef541..39adbfb8 100644 --- a/nx/source/gfx/ioctl/nvhost-ctrl-gpu.c +++ b/nx/source/display/ioctl/nvhost-ctrl-gpu.c @@ -2,8 +2,8 @@ #include "types.h" #include "result.h" #include "services/nv.h" -#include "gfx/ioctl.h" -#include "gfx/nvioctl.h" +#include "display/ioctl.h" +#include "display/nvioctl.h" Result nvioctlNvhostCtrlGpu_ZCullGetCtxSize(u32 fd, u32 *out) { Result rc = 0; diff --git a/nx/source/gfx/ioctl/nvhost-ctrl.c b/nx/source/display/ioctl/nvhost-ctrl.c similarity index 95% rename from nx/source/gfx/ioctl/nvhost-ctrl.c rename to nx/source/display/ioctl/nvhost-ctrl.c index e00f6983..d78db31c 100644 --- a/nx/source/gfx/ioctl/nvhost-ctrl.c +++ b/nx/source/display/ioctl/nvhost-ctrl.c @@ -2,8 +2,8 @@ #include "types.h" #include "result.h" #include "services/nv.h" -#include "gfx/ioctl.h" -#include "gfx/nvioctl.h" +#include "display/ioctl.h" +#include "display/nvioctl.h" Result nvioctlNvhostCtrl_EventSignal(u32 fd, u32 event_id) { struct { diff --git a/nx/source/gfx/ioctl/nvmap.c b/nx/source/display/ioctl/nvmap.c similarity index 96% rename from nx/source/gfx/ioctl/nvmap.c rename to nx/source/display/ioctl/nvmap.c index 09caf120..4727c8ea 100644 --- a/nx/source/gfx/ioctl/nvmap.c +++ b/nx/source/display/ioctl/nvmap.c @@ -2,8 +2,8 @@ #include "types.h" #include "result.h" #include "services/nv.h" -#include "gfx/ioctl.h" -#include "gfx/nvioctl.h" +#include "display/ioctl.h" +#include "display/nvioctl.h" Result nvioctlNvmap_Create(u32 fd, u32 size, u32 *nvmap_handle) { Result rc=0; diff --git a/nx/source/gfx/nvgfx.c b/nx/source/display/nvgfx.c similarity index 99% rename from nx/source/gfx/nvgfx.c rename to nx/source/display/nvgfx.c index 9eb4272b..c3649580 100644 --- a/nx/source/gfx/nvgfx.c +++ b/nx/source/display/nvgfx.c @@ -5,10 +5,10 @@ #include "arm/cache.h" #include "kernel/svc.h" #include "services/nv.h" -#include "gfx/binder.h" -#include "gfx/buffer_producer.h" -#include "gfx/nvioctl.h" -#include "gfx/nvgfx.h" +#include "display/binder.h" +#include "display/buffer_producer.h" +#include "display/nvioctl.h" +#include "display/nvgfx.h" //#include "nvgfx_gpu_gpfifo_data0_bin.h" diff --git a/nx/source/gfx/parcel.c b/nx/source/display/parcel.c similarity index 99% rename from nx/source/gfx/parcel.c rename to nx/source/display/parcel.c index 57526373..47c843d7 100644 --- a/nx/source/gfx/parcel.c +++ b/nx/source/display/parcel.c @@ -1,6 +1,6 @@ #include #include "result.h" -#include "gfx/parcel.h" +#include "display/parcel.h" // This implements Android Parcel, hence names etc here are based on Android Parcel.cpp. diff --git a/nx/source/runtime/devices/console.c b/nx/source/runtime/devices/console.c index bb9c03f3..f70584f9 100644 --- a/nx/source/runtime/devices/console.c +++ b/nx/source/runtime/devices/console.c @@ -3,7 +3,7 @@ #include #include "runtime/devices/console.h" #include "kernel/svc.h" -#include "gfx/gfx.h" +#include "display/gfx.h" #include "default_font_bin.h" diff --git a/nx/source/services/nv.c b/nx/source/services/nv.c index f7cf609e..e62d27cf 100644 --- a/nx/source/services/nv.c +++ b/nx/source/services/nv.c @@ -3,7 +3,7 @@ #include "result.h" #include "kernel/ipc.h" #include "services/applet.h" -#include "gfx/ioctl.h" +#include "display/ioctl.h" #include "services/nv.h" #include "services/sm.h" #include "kernel/tmem.h"