From 5b46bdc266588b091ca12f55ac3d74c9711ab0bf Mon Sep 17 00:00:00 2001 From: PatrickvL Date: Thu, 21 Jun 2018 11:34:38 +0200 Subject: [PATCH] Expanded NV2A methods/ranges --- src/CxbxKrnl/EmuD3D8/Convert.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/CxbxKrnl/EmuD3D8/Convert.h b/src/CxbxKrnl/EmuD3D8/Convert.h index 45e3d0d99..8ce72b2d4 100755 --- a/src/CxbxKrnl/EmuD3D8/Convert.h +++ b/src/CxbxKrnl/EmuD3D8/Convert.h @@ -1073,6 +1073,12 @@ extern void EmuUnswizzleBox RANGED(NV2A_LIGHT_BACK_SIDE_PRODUCT_AMBIENT_R, 0x00000c00, 0x40, 8) \ RANGED(NV2A_LIGHT_BACK_SIDE_PRODUCT_AMBIENT_G, 0x00000c04, 0x40, 8) \ RANGED(NV2A_LIGHT_BACK_SIDE_PRODUCT_AMBIENT_B, 0x00000c08, 0x40, 8) \ + RANGED(NV2A_LIGHT_BACK_SIDE_PRODUCT_DIFFUSE_R, 0x00000c0c, 0x40, 8) \ + RANGED(NV2A_LIGHT_BACK_SIDE_PRODUCT_DIFFUSE_G, 0x00000c10, 0x40, 8) \ + RANGED(NV2A_LIGHT_BACK_SIDE_PRODUCT_DIFFUSE_B, 0x00000c14, 0x40, 8) \ + RANGED(NV2A_LIGHT_BACK_SIDE_PRODUCT_SPECULAR_R, 0x00000c18, 0x40, 8) \ + RANGED(NV2A_LIGHT_BACK_SIDE_PRODUCT_SPECULAR_G, 0x00000c1c, 0x40, 8) \ + RANGED(NV2A_LIGHT_BACK_SIDE_PRODUCT_SPECULAR_B, 0x00000c20, 0x40, 8) \ RANGED(NV2A_LIGHT_FRONT_SIDE_PRODUCT_AMBIENT_R, 0x00001000, 0x80, 8) \ RANGED(NV2A_LIGHT_FRONT_SIDE_PRODUCT_AMBIENT_G, 0x00001004, 0x80, 8) \ RANGED(NV2A_LIGHT_FRONT_SIDE_PRODUCT_AMBIENT_B, 0x00001008, 0x80, 8) \ @@ -1082,12 +1088,19 @@ extern void EmuUnswizzleBox RANGED(NV2A_LIGHT_FRONT_SIDE_PRODUCT_SPECULAR_R, 0x00001018, 0x80, 8) \ RANGED(NV2A_LIGHT_FRONT_SIDE_PRODUCT_SPECULAR_G, 0x0000101c, 0x80, 8) \ RANGED(NV2A_LIGHT_FRONT_SIDE_PRODUCT_SPECULAR_B, 0x00001020, 0x80, 8) \ + RANGED(NV2A_LIGHT_LOCAL_RANGE, 0x00001024, 0x80, 8) \ RANGED(NV2A_LIGHT_HALF_VECTOR_X, 0x00001028, 0x80, 8) \ RANGED(NV2A_LIGHT_HALF_VECTOR_Y, 0x0000102c, 0x80, 8) \ RANGED(NV2A_LIGHT_HALF_VECTOR_Z, 0x00001030, 0x80, 8) \ RANGED(NV2A_LIGHT_DIRECTION_X, 0x00001034, 0x80, 8) \ RANGED(NV2A_LIGHT_DIRECTION_Y, 0x00001038, 0x80, 8) \ RANGED(NV2A_LIGHT_DIRECTION_Z, 0x0000103c, 0x80, 8) \ + RANGED(NV2A_LIGHT_SPOT_FALLOFF_X, 0x00001040, 0x80, 8) \ + RANGED(NV2A_LIGHT_SPOT_FALLOFF_Y, 0x00001044, 0x80, 8) \ + RANGED(NV2A_LIGHT_SPOT_FALLOFF_Z, 0x00001048, 0x80, 8) \ + RANGED(NV2A_LIGHT_SPOT_DIRECTION_X, 0x0000104c, 0x80, 8) \ + RANGED(NV2A_LIGHT_SPOT_DIRECTION_Y, 0x00001050, 0x80, 8) \ + RANGED(NV2A_LIGHT_SPOT_DIRECTION_Z, 0x00001054, 0x80, 8) \ RANGED(NV2A_LIGHT_POSITION_X, 0x0000105c, 0x80, 8) \ RANGED(NV2A_LIGHT_POSITION_Y, 0x00001060, 0x80, 8) \ RANGED(NV2A_LIGHT_POSITION_Z, 0x00001064, 0x80, 8) \ @@ -1243,6 +1256,10 @@ extern void EmuUnswizzleBox RANGED(NV2A_SET_WEIGHT3F, 0x000016b0, 0x04, 3) \ METHOD(NV2A_EDGEFLAG_ENABLE, 0x000016bc) \ RANGED(NV2A_SET_WEIGHT4F, 0x000016c0, 0x04, 4) \ + RANGED(NV2A_TRANSFORM_FIXED_CONST3, 0x000016d0, 0x04, 4) \ + RANGED(NV2A_TRANSFORM_FIXED_CONST0, 0x000016e0, 0x04, 4) \ + RANGED(NV2A_TRANSFORM_FIXED_CONST1, 0x000016f0, 0x04, 4) \ + RANGED(NV2A_TRANSFORM_FIXED_CONST2, 0x00001700, 0x04, 4) \ METHOD(NV2A_INVALIDATE_VERTEX_CACHE_FILE, 0x00001710) \ METHOD(NV2A_INVALIDATE_VERTEX_FILE, 0x00001714) \ METHOD(NV2A_TL_NOP, 0x00001718) \ @@ -1508,6 +1525,7 @@ extern void EmuUnswizzleBox METHOD(NV2A_UNPARK_ATTRIBUTE, 0x00001d68) \ METHOD(NV2A_SET_SEMAPHORE_OFFSET, 0x00001d6c) \ METHOD(NV2A_BACK_END_WRITE_SEMAPHORE_RELEASE, 0x00001d70) \ + METHOD(NV2A_TEXTURE_READ_SEMAPHORE_RELEASE, 0x00001d74) \ METHOD(NV2A_DEPTHCLIPCONTROL, 0x00001d78) \ BITFLD(NV2A_DEPTHCLIPCONTROL_CLAMP_SHIFT, 4) \ BITFLD(NV2A_DEPTHCLIPCONTROL_CLAMP_MASK, 0x000000f0) \