From 7874f746eb577ad01f599b6d36aff5dfc88e9f53 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 9 Jan 2010 08:40:57 +0000 Subject: [PATCH] gfx3d: fix a bug in vectest? --- desmume/src/MMU.cpp | 4 ---- desmume/src/gfx3d.cpp | 10 ++-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/desmume/src/MMU.cpp b/desmume/src/MMU.cpp index dcdbbb03b..367812cbd 100644 --- a/desmume/src/MMU.cpp +++ b/desmume/src/MMU.cpp @@ -3365,10 +3365,6 @@ u16 FASTCALL _MMU_ARM9_read16(u32 adr) return 0; //almost worthless for now //return (gfx3d_GetNumVertex()); - //case 0x04000630: - //case 0x04000632: - //case 0x04000634: - // return gfx3d_glGetVecRes((adr & 0xF) >> 1); // ============================================= 3D end case REG_IME : return (u16)MMU.reg_IME[ARMCPU_ARM9]; diff --git a/desmume/src/gfx3d.cpp b/desmume/src/gfx3d.cpp index 20c436c8e..7ab9c2d57 100644 --- a/desmume/src/gfx3d.cpp +++ b/desmume/src/gfx3d.cpp @@ -1,6 +1,6 @@ /* gfx3d.cpp Copyright (C) 2006 yopyop - Copyright (C) 2008-2009 DeSmuME team + Copyright (C) 2008-2010 DeSmuME team This file is part of DeSmuME @@ -1547,7 +1547,7 @@ static void gfx3d_glVecTest(u32 v) CACHE_ALIGN float normal[4] = { normalTable[v&1023], normalTable[(v>>10)&1023], normalTable[(v>>20)&1023], - 1}; + 0}; MatrixMultVec4x4(mtxCurrent[2], normal); @@ -1657,12 +1657,6 @@ unsigned int gfx3d_glGetPosRes(unsigned int index) return (unsigned int)(PTcoords[index] * 4096.0f); } -unsigned short gfx3d_glGetVecRes(unsigned int index) -{ - //INFO("NDS_glGetVecRes\n"); - return 0; -} - //#define _3D_LOG_EXEC static void gfx3d_execute(u8 cmd, u32 param) {