mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved the single-framebuf-size field from gfx into nvgfx. Use this field instead of hard-coded size in nvgfx, in some cases. Other adjustments.

Browse Source
This commit is contained in:
yellows8 2017-11-20 11:13:47 -05:00
parent 7c826e57e8
commit 24adf197af
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nx/source/gfx/gfx.c
View File

@ -13,11 +13,11 @@ static s32 g_gfxCurrentBuffer = 0;
static s32 g_gfxCurrentProducerBuffer = 0; static s32 g_gfxCurrentProducerBuffer = 0;
static u8 *g_gfxFramebuf; static u8 *g_gfxFramebuf;
static size_t g_gfxFramebufSize; static size_t g_gfxFramebufSize;
static size_t g_gfxFramebufSingleSize = 0x3c0000;
extern u32 __nx_applet_type; extern u32 __nx_applet_type;
extern u32 g_nvgfx_totalframebufs; extern u32 g_nvgfx_totalframebufs;
extern size_t g_nvgfx_singleframebuf_size;
static u32 g_gfxQueueBufferData[0x5c>>2] = { static u32 g_gfxQueueBufferData[0x5c>>2] = {
0x54, 0x0, 0x54, 0x0,
@ -235,10 +235,10 @@ u8* gfxGetFramebuffer(u16* width, u16* height) {
if(width) *width = 1280; if(width) *width = 1280;
if(height) *height = 720; if(height) *height = 720;
return &g_gfxFramebuf[g_gfxCurrentBuffer*g_gfxFramebufSingleSize]; return &g_gfxFramebuf[g_gfxCurrentBuffer*g_nvgfx_singleframebuf_size];
} }
void gfxFlushBuffers(void) { void gfxFlushBuffers(void) {
armDCacheFlush(&g_gfxFramebuf[g_gfxCurrentBuffer*g_gfxFramebufSingleSize], g_gfxFramebufSingleSize); armDCacheFlush(&g_gfxFramebuf[g_gfxCurrentBuffer*g_nvgfx_singleframebuf_size], g_nvgfx_singleframebuf_size);
} }

9
nx/source/gfx/nvgfx.c
View File

@ -34,6 +34,7 @@ static size_t g_nvgfx_nvhost_userdata_size;
static u32 g_nvgfx_nvhostctrl_eventres; static u32 g_nvgfx_nvhostctrl_eventres;
u32 g_nvgfx_totalframebufs = 0; u32 g_nvgfx_totalframebufs = 0;
size_t g_nvgfx_singleframebuf_size = /*0x3c0000*/ 1280*768*4;
static nvmapobj nvmap_objs[18]; static nvmapobj nvmap_objs[18];
@ -51,7 +52,7 @@ static u32 g_gfxprod_BufferInitData[0x178>>2] = {
0x0, 0xdaffcaff, 0x2a, 0x0, 0x0, 0xdaffcaff, 0x2a, 0x0,
0xb00, 0x1, 0x1, 1280, 0xb00, 0x1, 0x1, 1280,
0x3c0000, 0x1, 0x0, 1280, 0x3c0000, 0x1, 0x0, 1280,
720, 0x532120/* & ~0x20*/, 0x1, 0x3, //0x52* field is flags 720, 0x532120, 0x1, 0x3, //0x52* field is flags
0x1400, 0x1400,
0x0, //nvmap handle 0x0, //nvmap handle
0x0, 0x0,
@ -164,7 +165,7 @@ Result nvgfxInitialize(void) {
if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[3], 0x10000); if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[3], 0x10000);
if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[4], 0x59000); if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[4], 0x59000);
if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[5], 0x1000000); if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[5], 0x1000000);
if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[6], g_nvgfx_totalframebufs*0x3c0000); if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[6], g_nvgfx_totalframebufs*g_nvgfx_singleframebuf_size);
if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[7], 0x1000000); if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[7], 0x1000000);
if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[8], 0x800000); if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[8], 0x800000);
if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[9], 0x100000); if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[9], 0x100000);
@ -280,7 +281,7 @@ Result nvgfxInitialize(void) {
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
for(pos=0; pos<g_nvgfx_totalframebufs; pos++) { for(pos=0; pos<g_nvgfx_totalframebufs; pos++) {
rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 0x100, pos<3 ? 0xdb : 0x86, framebuf_nvmap_handle, 0, pos*0x3c0000, 0x3c0000, nvmap_obj6_mapbuffer_xdb_offset, NULL); rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 0x100, pos<3 ? 0xdb : 0x86, framebuf_nvmap_handle, 0, pos*g_nvgfx_singleframebuf_size, g_nvgfx_singleframebuf_size, nvmap_obj6_mapbuffer_xdb_offset, NULL);
if (R_FAILED(rc)) break; if (R_FAILED(rc)) break;
if(pos==1) { if(pos==1) {
@ -305,7 +306,7 @@ Result nvgfxInitialize(void) {
g_gfxprod_BufferInitData[0xa] = i; g_gfxprod_BufferInitData[0xa] = i;
g_gfxprod_BufferInitData[0xe] = tmpval; g_gfxprod_BufferInitData[0xe] = tmpval;
g_gfxprod_BufferInitData[0x20] = tmpval; g_gfxprod_BufferInitData[0x20] = tmpval;
g_gfxprod_BufferInitData[0x21] = 0x3c0000*i; g_gfxprod_BufferInitData[0x21] = g_nvgfx_singleframebuf_size*i;
ptr64[0x170>>3] = svcGetSystemTick(); ptr64[0x170>>3] = svcGetSystemTick();
rc = gfxproducerTegraBufferInit(i, (u8*)g_gfxprod_BufferInitData); rc = gfxproducerTegraBufferInit(i, (u8*)g_gfxprod_BufferInitData);
if (R_FAILED(rc)) break; if (R_FAILED(rc)) break;