Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add several definitions for Multi/Double DRC mode #266

Merged
merged 1 commit into from
Aug 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions include/avm/drc.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,22 @@ typedef enum AVMDrcScanMode
AVM_DRC_SCAN_MODE_UNKNOWN_255 = 255,
} AVMDrcScanMode;

typedef enum AVMDrcMode
{
AVM_DRC_MODE_NONE = 0,
AVM_DRC_MODE_SINGLE = 1,
AVM_DRC_MODE_DOUBLE = 2,
} AVMDrcMode;

BOOL
AVMGetDRCScanMode(AVMDrcScanMode *outScanMode);

BOOL
AVMGetDRCMode(AVMDrcMode *outMode);

uint32_t
AVMProbeDRCNum(void);

#ifdef __cplusplus
}
#endif
Expand Down
6 changes: 6 additions & 0 deletions include/gx2/display.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
extern "C" {
#endif

typedef void (*GX2DRCConnectCallback)(uint32_t drcSlot, BOOL attached);

void
GX2SetTVEnable(BOOL enable);

Expand Down Expand Up @@ -64,6 +66,10 @@ GX2GetSystemDRCScanMode();
GX2DrcRenderMode
GX2GetSystemDRCMode();

GX2DRCConnectCallback
GX2SetDRCConnectCallback(uint32_t drcSlot,
GX2DRCConnectCallback callback);

#ifdef __cplusplus
}
#endif
Expand Down
9 changes: 7 additions & 2 deletions include/gx2/enum.h
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ typedef enum GX2DrcRenderMode
{
GX2_DRC_RENDER_MODE_DISABLED = 0,
GX2_DRC_RENDER_MODE_SINGLE = 1,
GX2_DRC_RENDER_MODE_DOUBLE = 2,
} GX2DrcRenderMode;

typedef enum GX2EventType
Expand Down Expand Up @@ -325,8 +326,12 @@ typedef enum GX2SamplerVarType

typedef enum GX2ScanTarget
{
GX2_SCAN_TARGET_TV = 1,
GX2_SCAN_TARGET_DRC = 4,
GX2_SCAN_TARGET_TV0 = 1 << 0,
GX2_SCAN_TARGET_TV1 = 1 << 1,
GX2_SCAN_TARGET_DRC0 = 1 << 2,
GX2_SCAN_TARGET_DRC1 = 1 << 3,
GX2_SCAN_TARGET_TV = GX2_SCAN_TARGET_TV0,
GX2_SCAN_TARGET_DRC = GX2_SCAN_TARGET_DRC0,
} GX2ScanTarget;

typedef enum GX2ShaderMode
Expand Down
2 changes: 2 additions & 0 deletions include/vpad/input.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ typedef enum VPADChan
{
//! Channel 0.
VPAD_CHAN_0 = 0,
//! Channel 1.
VPAD_CHAN_1 = 1,
} VPADChan;

//! Touch pad validity.
Expand Down
2 changes: 1 addition & 1 deletion libraries/libwhb/src/gfx.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ WHBGfxInit()
};
GX2Init(initAttribs);

sDrcRenderMode = GX2GetSystemDRCScanMode();
sDrcRenderMode = GX2GetSystemDRCMode();
sTvSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8;
sDrcSurfaceFormat = GX2_SURFACE_FORMAT_UNORM_R8_G8_B8_A8;

Expand Down