Add fragment lighting register names, enumerations, etc

diff --git a/examples/graphics/gpu/geoshader/source/main.c b/examples/graphics/gpu/geoshader/source/main.c
index b49db2f8e0288385ddafc51be690b301f675c2c8..421e6e863b86be0871df8a82f6ab5a4da1f04006 100644 (file)
--- a/examples/graphics/gpu/geoshader/source/main.c
+++ b/examples/graphics/gpu/geoshader/source/main.c
@@ -82,8 +82,8 @@ static void sceneRender(void)
        // Upload the projection matrix
        GPU_SetFloatUniformMatrix(GPU_GEOMETRY_SHADER, uLoc_projection, &projection);
 
-       // Draw the VBO - GPU_UNKPRIM allows the geoshader to control primitive emission
-       GPU_DrawArray(GPU_UNKPRIM, 0, vertex_list_count);
+       // Draw the VBO - GPU_GEOMETRY_PRIM allows the geoshader to control primitive emission
+       GPU_DrawArray(GPU_GEOMETRY_PRIM, 0, vertex_list_count);
 }
 
 static void sceneExit(void)

diff --git a/libctru/include/3ds/gpu/enums.h b/libctru/include/3ds/gpu/enums.h
index 996ad13bded5dc1ed6eca48a18306b21fc5deb26..58645b27a0ca3fda3b35a4e10faf40b10663b1c6 100644 (file)
--- a/libctru/include/3ds/gpu/enums.h
+++ b/libctru/include/3ds/gpu/enums.h
@@ -1,10 +1,10 @@
 #pragma once
 
 //tex param
-#define GPU_TEXTURE_MAG_FILTER(v) (((v)&0x1)<<1) //takes a GPU_TEXTURE_FILTER_PARAM
-#define GPU_TEXTURE_MIN_FILTER(v) (((v)&0x1)<<2) //takes a GPU_TEXTURE_FILTER_PARAM
-#define GPU_TEXTURE_WRAP_S(v) (((v)&0x3)<<12) //takes a GPU_TEXTURE_WRAP_PARAM
-#define GPU_TEXTURE_WRAP_T(v) (((v)&0x3)<<8) //takes a GPU_TEXTURE_WRAP_PARAM
+#define GPU_TEXTURE_MAG_FILTER(v) (((v)&0x1)<<1)  //takes a GPU_TEXTURE_FILTER_PARAM
+#define GPU_TEXTURE_MIN_FILTER(v) (((v)&0x1)<<2)  //takes a GPU_TEXTURE_FILTER_PARAM
+#define GPU_TEXTURE_WRAP_S(v)     (((v)&0x3)<<12) //takes a GPU_TEXTURE_WRAP_PARAM
+#define GPU_TEXTURE_WRAP_T(v)     (((v)&0x3)<<8)  //takes a GPU_TEXTURE_WRAP_PARAM
 
 // Combiner buffer write config
 #define GPU_TEV_BUFFER_WRITE_CONFIG(stage0, stage1, stage2, stage3) ((stage0) | ((stage1) << 1) | ((stage2) << 2) | ((stage3) << 3))
@@ -12,8 +12,8 @@
 typedef enum
 {
        GPU_NEAREST = 0x0,
-       GPU_LINEAR = 0x1,
-}GPU_TEXTURE_FILTER_PARAM;
+       GPU_LINEAR  = 0x1,
+} GPU_TEXTURE_FILTER_PARAM;
 
 typedef enum
 {
@@ -21,227 +21,301 @@ typedef enum
        GPU_CLAMP_TO_BORDER = 0x1,
        GPU_REPEAT          = 0x2,
        GPU_MIRRORED_REPEAT = 0x3,
-}GPU_TEXTURE_WRAP_PARAM;
+} GPU_TEXTURE_WRAP_PARAM;
 
 typedef enum
 {
        GPU_TEXUNIT0 = 0x1,
        GPU_TEXUNIT1 = 0x2,
-       GPU_TEXUNIT2 = 0x4
+       GPU_TEXUNIT2 = 0x4,
 } GPU_TEXUNIT;
 
-typedef enum{
-       GPU_RGBA8=0x0,
-       GPU_RGB8=0x1,
-       GPU_RGBA5551=0x2,
-       GPU_RGB565=0x3,
-       GPU_RGBA4=0x4,
-       GPU_LA8=0x5,
-       GPU_HILO8=0x6,
-       GPU_L8=0x7,
-       GPU_A8=0x8,
-       GPU_LA4=0x9,
-       GPU_L4=0xA,
-       GPU_ETC1=0xB,
-       GPU_ETC1A4=0xC
-}GPU_TEXCOLOR;
-
-typedef enum
-{
-       GPU_NEVER = 0,
-       GPU_ALWAYS = 1,
-       GPU_EQUAL = 2,
+typedef enum
+{
+       GPU_RGBA8    = 0x0,
+       GPU_RGB8     = 0x1,
+       GPU_RGBA5551 = 0x2,
+       GPU_RGB565   = 0x3,
+       GPU_RGBA4    = 0x4,
+       GPU_LA8      = 0x5,
+       GPU_HILO8    = 0x6,
+       GPU_L8       = 0x7,
+       GPU_A8       = 0x8,
+       GPU_LA4      = 0x9,
+       GPU_L4       = 0xA,
+       GPU_ETC1     = 0xB,
+       GPU_ETC1A4   = 0xC,
+} GPU_TEXCOLOR;
+
+typedef enum
+{
+       GPU_NEVER    = 0,
+       GPU_ALWAYS   = 1,
+       GPU_EQUAL    = 2,
        GPU_NOTEQUAL = 3,
-       GPU_LESS = 4,
-       GPU_LEQUAL = 5,
-       GPU_GREATER = 6,
-       GPU_GEQUAL = 7
+       GPU_LESS     = 4,
+       GPU_LEQUAL   = 5,
+       GPU_GREATER  = 6,
+       GPU_GEQUAL   = 7,
 }GPU_TESTFUNC;
 
 typedef enum
 {
-       GPU_SCISSOR_DISABLE = 0,        // disable scissor test
-       GPU_SCISSOR_INVERT = 1,         // exclude pixels inside the scissor box
+       GPU_SCISSOR_DISABLE = 0, // disable scissor test
+       GPU_SCISSOR_INVERT  = 1, // exclude pixels inside the scissor box
        // 2 is the same as 0
-       GPU_SCISSOR_NORMAL = 3,         // exclude pixels outside of the scissor box
+       GPU_SCISSOR_NORMAL  = 3, // exclude pixels outside of the scissor box
        
 } GPU_SCISSORMODE;
 
 typedef enum
 {
-       GPU_STENCIL_KEEP = 0,       // old_stencil
-       GPU_STENCIL_ZERO = 1,       // 0
-       GPU_STENCIL_REPLACE = 2,    // ref
-       GPU_STENCIL_INCR = 3,       // old_stencil + 1 saturated to [0, 255]
-       GPU_STENCIL_DECR = 4,       // old_stencil - 1 saturated to [0, 255]
-       GPU_STENCIL_INVERT = 5,     // ~old_stencil
-       GPU_STENCIL_INCR_WRAP = 6,  // old_stencil + 1
-       GPU_STENCIL_DECR_WRAP = 7   // old_stencil - 1
+       GPU_STENCIL_KEEP      = 0, // old_stencil
+       GPU_STENCIL_ZERO      = 1, // 0
+       GPU_STENCIL_REPLACE   = 2, // ref
+       GPU_STENCIL_INCR      = 3, // old_stencil + 1 saturated to [0, 255]
+       GPU_STENCIL_DECR      = 4, // old_stencil - 1 saturated to [0, 255]
+       GPU_STENCIL_INVERT    = 5, // ~old_stencil
+       GPU_STENCIL_INCR_WRAP = 6, // old_stencil + 1
+       GPU_STENCIL_DECR_WRAP = 7, // old_stencil - 1
 } GPU_STENCILOP;
 
 typedef enum
 {
-       GPU_WRITE_RED = 0x01,
+       GPU_WRITE_RED   = 0x01,
        GPU_WRITE_GREEN = 0x02,
-       GPU_WRITE_BLUE = 0x04,
+       GPU_WRITE_BLUE  = 0x04,
        GPU_WRITE_ALPHA = 0x08,
        GPU_WRITE_DEPTH = 0x10,
        
        GPU_WRITE_COLOR = 0x0F,
-       GPU_WRITE_ALL = 0x1F
+       GPU_WRITE_ALL   = 0x1F,
 } GPU_WRITEMASK;
 
 typedef enum
 {
-       GPU_BLEND_ADD = 0,
-       GPU_BLEND_SUBTRACT = 1,
+       GPU_BLEND_ADD              = 0,
+       GPU_BLEND_SUBTRACT         = 1,
        GPU_BLEND_REVERSE_SUBTRACT = 2,
-       GPU_BLEND_MIN = 3,
-       GPU_BLEND_MAX = 4
+       GPU_BLEND_MIN              = 3,
+       GPU_BLEND_MAX              = 4,
 } GPU_BLENDEQUATION;
 
 typedef enum
 {
-       GPU_ZERO = 0,
-       GPU_ONE = 1,
-       GPU_SRC_COLOR = 2,
-       GPU_ONE_MINUS_SRC_COLOR = 3,
-       GPU_DST_COLOR = 4,
-       GPU_ONE_MINUS_DST_COLOR = 5,
-       GPU_SRC_ALPHA = 6,
-       GPU_ONE_MINUS_SRC_ALPHA = 7,
-       GPU_DST_ALPHA = 8,
-       GPU_ONE_MINUS_DST_ALPHA = 9,
-       GPU_CONSTANT_COLOR = 10,
+       GPU_ZERO                     = 0,
+       GPU_ONE                      = 1,
+       GPU_SRC_COLOR                = 2,
+       GPU_ONE_MINUS_SRC_COLOR      = 3,
+       GPU_DST_COLOR                = 4,
+       GPU_ONE_MINUS_DST_COLOR      = 5,
+       GPU_SRC_ALPHA                = 6,
+       GPU_ONE_MINUS_SRC_ALPHA      = 7,
+       GPU_DST_ALPHA                = 8,
+       GPU_ONE_MINUS_DST_ALPHA      = 9,
+       GPU_CONSTANT_COLOR           = 10,
        GPU_ONE_MINUS_CONSTANT_COLOR = 11,
-       GPU_CONSTANT_ALPHA = 12,
+       GPU_CONSTANT_ALPHA           = 12,
        GPU_ONE_MINUS_CONSTANT_ALPHA = 13,
-       GPU_SRC_ALPHA_SATURATE = 14
+       GPU_SRC_ALPHA_SATURATE       = 14,
 } GPU_BLENDFACTOR;
 
 typedef enum
 {
-       GPU_LOGICOP_CLEAR = 0,
-       GPU_LOGICOP_AND = 1,
-       GPU_LOGICOP_AND_REVERSE = 2,
-       GPU_LOGICOP_COPY = 3,
-       GPU_LOGICOP_SET = 4,
+       GPU_LOGICOP_CLEAR         = 0,
+       GPU_LOGICOP_AND           = 1,
+       GPU_LOGICOP_AND_REVERSE   = 2,
+       GPU_LOGICOP_COPY          = 3,
+       GPU_LOGICOP_SET           = 4,
        GPU_LOGICOP_COPY_INVERTED = 5,
-       GPU_LOGICOP_NOOP = 6,
-       GPU_LOGICOP_INVERT = 7,
-       GPU_LOGICOP_NAND = 8,
-       GPU_LOGICOP_OR = 9,
-       GPU_LOGICOP_NOR = 10,
-       GPU_LOGICOP_XOR = 11,
-       GPU_LOGICOP_EQUIV = 12,
-       GPU_LOGICOP_AND_INVERTED = 13,
-       GPU_LOGICOP_OR_REVERSE = 14,
-       GPU_LOGICOP_OR_INVERTED = 15
+       GPU_LOGICOP_NOOP          = 6,
+       GPU_LOGICOP_INVERT        = 7,
+       GPU_LOGICOP_NAND          = 8,
+       GPU_LOGICOP_OR            = 9,
+       GPU_LOGICOP_NOR           = 10,
+       GPU_LOGICOP_XOR           = 11,
+       GPU_LOGICOP_EQUIV         = 12,
+       GPU_LOGICOP_AND_INVERTED  = 13,
+       GPU_LOGICOP_OR_REVERSE    = 14,
+       GPU_LOGICOP_OR_INVERTED   = 15,
 } GPU_LOGICOP;
 
-typedef enum{
-       GPU_BYTE = 0,
+typedef enum
+{
+       GPU_BYTE          = 0,
        GPU_UNSIGNED_BYTE = 1,
-       GPU_SHORT = 2,
-       GPU_FLOAT = 3
-}GPU_FORMATS;
+       GPU_SHORT         = 2,
+       GPU_FLOAT         = 3,
+} GPU_FORMATS;
 
-//defines for CW ?
-typedef enum{
-       GPU_CULL_NONE = 0,
+typedef enum
+{
+       GPU_CULL_NONE      = 0,
        GPU_CULL_FRONT_CCW = 1,
-       GPU_CULL_BACK_CCW = 2
-}GPU_CULLMODE;
+       GPU_CULL_BACK_CCW  = 2,
+} GPU_CULLMODE;
 
 #define GPU_ATTRIBFMT(i, n, f) (((((n)-1)<<2)|((f)&3))<<((i)*4))
 
 /**
 * Texture combiners sources 
 */
-typedef enum{
-       GPU_PRIMARY_COLOR = 0x00,
-       GPU_FRAGMENT_PRIMARY_COLOR = 0x01,
+typedef enum
+{
+       GPU_PRIMARY_COLOR            = 0x00,
+       GPU_FRAGMENT_PRIMARY_COLOR   = 0x01,
        GPU_FRAGMENT_SECONDARY_COLOR = 0x02,
-       GPU_TEXTURE0 = 0x03,
-       GPU_TEXTURE1 = 0x04,
-       GPU_TEXTURE2 = 0x05,
-       GPU_TEXTURE3 = 0x06,
-       GPU_PREVIOUS_BUFFER = 0x0D,
-       GPU_CONSTANT = 0x0E,
-       GPU_PREVIOUS = 0x0F,
-}GPU_TEVSRC;
+       GPU_TEXTURE0                 = 0x03,
+       GPU_TEXTURE1                 = 0x04,
+       GPU_TEXTURE2                 = 0x05,
+       GPU_TEXTURE3                 = 0x06,
+       GPU_PREVIOUS_BUFFER          = 0x0D,
+       GPU_CONSTANT                 = 0x0E,
+       GPU_PREVIOUS                 = 0x0F,
+} GPU_TEVSRC;
 
 /**
 * Texture RGB combiners operands
 */
-typedef enum{
-       GPU_TEVOP_RGB_SRC_COLOR = 0x00,
+typedef enum
+{
+       GPU_TEVOP_RGB_SRC_COLOR           = 0x00,
        GPU_TEVOP_RGB_ONE_MINUS_SRC_COLOR = 0x01,
-       GPU_TEVOP_RGB_SRC_ALPHA = 0x02,
+       GPU_TEVOP_RGB_SRC_ALPHA           = 0x02,
        GPU_TEVOP_RGB_ONE_MINUS_SRC_ALPHA = 0x03,
-       GPU_TEVOP_RGB_SRC_R = 0x04,
-       GPU_TEVOP_RGB_ONE_MINUS_SRC_R = 0x05,
-       GPU_TEVOP_RGB_0x06 = 0x06,
-       GPU_TEVOP_RGB_0x07 = 0x07,
-       GPU_TEVOP_RGB_SRC_G = 0x08,
-       GPU_TEVOP_RGB_ONE_MINUS_SRC_G = 0x09,
-       GPU_TEVOP_RGB_0x0A = 0x0A,
-       GPU_TEVOP_RGB_0x0B = 0x0B,
-       GPU_TEVOP_RGB_SRC_B = 0x0C,
-       GPU_TEVOP_RGB_ONE_MINUS_SRC_B = 0x0D,
-       GPU_TEVOP_RGB_0x0E = 0x0E,
-       GPU_TEVOP_RGB_0x0F = 0x0F,
-}GPU_TEVOP_RGB;
+       GPU_TEVOP_RGB_SRC_R               = 0x04,
+       GPU_TEVOP_RGB_ONE_MINUS_SRC_R     = 0x05,
+       GPU_TEVOP_RGB_0x06                = 0x06,
+       GPU_TEVOP_RGB_0x07                = 0x07,
+       GPU_TEVOP_RGB_SRC_G               = 0x08,
+       GPU_TEVOP_RGB_ONE_MINUS_SRC_G     = 0x09,
+       GPU_TEVOP_RGB_0x0A                = 0x0A,
+       GPU_TEVOP_RGB_0x0B                = 0x0B,
+       GPU_TEVOP_RGB_SRC_B               = 0x0C,
+       GPU_TEVOP_RGB_ONE_MINUS_SRC_B     = 0x0D,
+       GPU_TEVOP_RGB_0x0E                = 0x0E,
+       GPU_TEVOP_RGB_0x0F                = 0x0F,
+} GPU_TEVOP_RGB;
 
 
 /**
 * Texture ALPHA combiners operands
 */
-typedef enum{
-       GPU_TEVOP_A_SRC_ALPHA = 0x00,
+typedef enum
+{
+       GPU_TEVOP_A_SRC_ALPHA           = 0x00,
        GPU_TEVOP_A_ONE_MINUS_SRC_ALPHA = 0x01,
-       GPU_TEVOP_A_SRC_R = 0x02,
-       GPU_TEVOP_A_ONE_MINUS_SRC_R = 0x03,
-       GPU_TEVOP_A_SRC_G = 0x04,
-       GPU_TEVOP_A_ONE_MINUS_SRC_G = 0x05,
-       GPU_TEVOP_A_SRC_B = 0x06,
-       GPU_TEVOP_A_ONE_MINUS_SRC_B = 0x07,
-}GPU_TEVOP_A;
+       GPU_TEVOP_A_SRC_R               = 0x02,
+       GPU_TEVOP_A_ONE_MINUS_SRC_R     = 0x03,
+       GPU_TEVOP_A_SRC_G               = 0x04,
+       GPU_TEVOP_A_ONE_MINUS_SRC_G     = 0x05,
+       GPU_TEVOP_A_SRC_B               = 0x06,
+       GPU_TEVOP_A_ONE_MINUS_SRC_B     = 0x07,
+} GPU_TEVOP_A;
 
 /**
 * Texture combiner functions
 */
-typedef enum{
-       GPU_REPLACE = 0x00,
-       GPU_MODULATE = 0x01,
-       GPU_ADD = 0x02,
-       GPU_ADD_SIGNED = 0x03,
-       GPU_INTERPOLATE = 0x04,
-       GPU_SUBTRACT = 0x05,
-       GPU_DOT3_RGB = 0x06, //RGB only
-       GPU_DOT3_RGBA = 0x07,
-}GPU_COMBINEFUNC;
+typedef enum
+{
+       GPU_REPLACE      = 0x00,
+       GPU_MODULATE     = 0x01,
+       GPU_ADD          = 0x02,
+       GPU_ADD_SIGNED   = 0x03,
+       GPU_INTERPOLATE  = 0x04,
+       GPU_SUBTRACT     = 0x05,
+       GPU_DOT3_RGB     = 0x06, //RGB only
+       GPU_MULTIPLY_ADD = 0x08,
+       GPU_ADD_MULTIPLY = 0x09,
+} GPU_COMBINEFUNC;
 
 /**
 * Texture scale factors
 */
-typedef enum{
+typedef enum
+{
        GPU_TEVSCALE_1 = 0x0,
        GPU_TEVSCALE_2 = 0x1,
        GPU_TEVSCALE_4 = 0x2,
-}GPU_TEVSCALE;
+} GPU_TEVSCALE;
 
-#define GPU_TEVSOURCES(a,b,c) (((a))|((b)<<4)|((c)<<8))
+#define GPU_TEVSOURCES(a,b,c)  (((a))|((b)<<4)|((c)<<8))
 #define GPU_TEVOPERANDS(a,b,c) (((a))|((b)<<4)|((c)<<8))
 
-typedef enum{
-       GPU_TRIANGLES = 0x0000,
+#define GPU_LIGHT_ENV_LAYER_CONFIG(n) ((n)+((n)==7))
+#define GPU_LC1_SHADOWBIT(n)   BIT(n)
+#define GPU_LC1_SPOTBIT(n)     BIT((n)+8)
+#define GPU_LC1_LUTBIT(n)      BIT((n)+16)
+#define GPU_LC1_ATTNBIT(n)     BIT((n)+24)
+#define GPU_LIGHTPERM(i,n)     ((n) << (i))
+#define GPU_LIGHTLUTINPUT(i,n) ((n) << ((i)*4))
+#define GPU_LIGHTLUTIDX(c,i,o) ((o) | ((i) << 8) | ((c) << 11))
+#define GPU_LIGHTCOLOR(r,g,b)  (((b) & 0xFF) | (((g) << 10) & 0xFF) | (((r) << 20) & 0xFF))
+
+typedef enum
+{
+       GPU_NO_FRESNEL            = 0,
+       GPU_PRI_ALPHA_FRESNEL     = 1,
+       GPU_SEC_ALPHA_FRESNEL     = 2,
+       GPU_PRI_SEC_ALPHA_FRESNEL = 3,
+} GPU_FRESNELSEL;
+
+typedef enum
+{
+       GPU_BUMP_NOT_USED = 0,
+       GPU_BUMP_AS_BUMP  = 1,
+       GPU_BUMP_AS_TANG  = 2,
+} GPU_BUMPMODE;
+
+typedef enum
+{
+       GPU_LUT_D0 = 0,
+       GPU_LUT_D1 = 1,
+       GPU_LUT_SP = 2,
+       GPU_LUT_FR = 3,
+       GPU_LUT_RB = 4,
+       GPU_LUT_RG = 5,
+       GPU_LUT_RR = 6,
+       GPU_LUT_DA = 7,
+} GPU_LIGHTLUTID;
+
+typedef enum
+{
+       GPU_LUTINPUT_NH = 0,
+       GPU_LUTINPUT_VH = 1,
+       GPU_LUTINPUT_NV = 2,
+       GPU_LUTINPUT_LN = 3,
+       GPU_LUTINPUT_SP = 4,
+       GPU_LUTINPUT_CP = 5,
+} GPU_LIGHTLUTINPUT;
+
+typedef enum
+{
+       GPU_LUTSCALER_1x    = 0,
+       GPU_LUTSCALER_2x    = 1,
+       GPU_LUTSCALER_4x    = 2,
+       GPU_LUTSCALER_8x    = 3,
+       GPU_LUTSCALER_0_25x = 6,
+       GPU_LUTSCALER_0_5x  = 7,
+} GPU_LIGHTLUTSCALER;
+
+typedef enum
+{
+       GPU_LUTSELECT_COMMON = 0,
+       GPU_LUTSELECT_SP     = 1,
+       GPU_LUTSELECT_DA     = 2,
+} GPU_LIGHTLUTSELECT;
+
+typedef enum
+{
+       GPU_TRIANGLES      = 0x0000,
        GPU_TRIANGLE_STRIP = 0x0100,
-       GPU_TRIANGLE_FAN = 0x0200,
-       GPU_UNKPRIM = 0x0300 // ?
-}GPU_Primitive_t;
-
-typedef enum{
-       GPU_VERTEX_SHADER=0x0,
-       GPU_GEOMETRY_SHADER=0x1
-}GPU_SHADER_TYPE;
+       GPU_TRIANGLE_FAN   = 0x0200,
+       GPU_GEOMETRY_PRIM  = 0x0300,
+} GPU_Primitive_t;
+
+typedef enum
+{
+       GPU_VERTEX_SHADER   = 0x0,
+       GPU_GEOMETRY_SHADER = 0x1,
+} GPU_SHADER_TYPE;

diff --git a/libctru/include/3ds/gpu/gpu.h b/libctru/include/3ds/gpu/gpu.h
index b9a869ecec16c3345a622bc39d9bea1343540a86..9403a172e89de18bb7cac39bb29d8c09f9f7c9b0 100644 (file)
--- a/libctru/include/3ds/gpu/gpu.h
+++ b/libctru/include/3ds/gpu/gpu.h
@@ -19,6 +19,8 @@ void GPUCMD_FlushAndRun(void);
 void GPUCMD_Add(u32 header, u32* param, u32 paramlength);
 void GPUCMD_Finalize(void);
 
+u32 f32tof16(float f);
+u32 f32tof20(float f);
 u32 f32tof24(float f);
 u32 f32tof31(float f);
 

diff --git a/libctru/include/3ds/gpu/registers.h b/libctru/include/3ds/gpu/registers.h
index ab8976129a3e8fc8c4f0215174c6374eeb8fb4cc..88943ba70ac1f8ef7ba2c732366d225b0a217926 100644 (file)
--- a/libctru/include/3ds/gpu/registers.h
+++ b/libctru/include/3ds/gpu/registers.h
@@ -157,7 +157,7 @@
 #define GPUREG_008C 0x008C\r
 #define GPUREG_008D 0x008D\r
 #define GPUREG_TEXUNIT0_TYPE 0x008E\r
-#define GPUREG_008F 0x008F\r
+#define GPUREG_LIGHTING_ENABLE0 0x008F\r
 #define GPUREG_0090 0x0090\r
 #define GPUREG_TEXUNIT1_BORDER_COLOR 0x0091\r
 #define GPUREG_TEXUNIT1_DIM 0x0092\r
@@ -344,160 +344,160 @@
 // Fragment lighting registers (0x140-0x1FF)\r
 //-----------------------------------------------------------------------------\r
 \r
-#define GPUREG_0140 0x0140\r
-#define GPUREG_0141 0x0141\r
-#define GPUREG_0142 0x0142\r
-#define GPUREG_0143 0x0143\r
-#define GPUREG_0144 0x0144\r
-#define GPUREG_0145 0x0145\r
-#define GPUREG_0146 0x0146\r
-#define GPUREG_0147 0x0147\r
+#define GPUREG_LIGHT0_SPECULAR0 0x0140\r
+#define GPUREG_LIGHT0_SPECULAR1 0x0141\r
+#define GPUREG_LIGHT0_DIFFUSE 0x0142\r
+#define GPUREG_LIGHT0_AMBIENT 0x0143\r
+#define GPUREG_LIGHT0_XY 0x0144\r
+#define GPUREG_LIGHT0_Z 0x0145\r
+#define GPUREG_LIGHT0_SPOTDIR_XY 0x0146\r
+#define GPUREG_LIGHT0_SPOTDIR_Z 0x0147\r
 #define GPUREG_0148 0x0148\r
-#define GPUREG_0149 0x0149\r
-#define GPUREG_014A 0x014A\r
-#define GPUREG_014B 0x014B\r
+#define GPUREG_LIGHT0_CONFIG 0x0149\r
+#define GPUREG_LIGHT0_ATTENUATION_BIAS 0x014A\r
+#define GPUREG_LIGHT0_ATTENUATION_SCALE 0x014B\r
 #define GPUREG_014C 0x014C\r
 #define GPUREG_014D 0x014D\r
 #define GPUREG_014E 0x014E\r
 #define GPUREG_014F 0x014F\r
-#define GPUREG_0150 0x0150\r
-#define GPUREG_0151 0x0151\r
-#define GPUREG_0152 0x0152\r
-#define GPUREG_0153 0x0153\r
-#define GPUREG_0154 0x0154\r
-#define GPUREG_0155 0x0155\r
-#define GPUREG_0156 0x0156\r
-#define GPUREG_0157 0x0157\r
+#define GPUREG_LIGHT1_SPECULAR0 0x0150\r
+#define GPUREG_LIGHT1_SPECULAR1 0x0151\r
+#define GPUREG_LIGHT1_DIFFUSE 0x0152\r
+#define GPUREG_LIGHT1_AMBIENT 0x0153\r
+#define GPUREG_LIGHT1_XY 0x0154\r
+#define GPUREG_LIGHT1_Z 0x0155\r
+#define GPUREG_LIGHT1_SPOTDIR_XY 0x0156\r
+#define GPUREG_LIGHT1_SPOTDIR_Z 0x0157\r
 #define GPUREG_0158 0x0158\r
-#define GPUREG_0159 0x0159\r
-#define GPUREG_015A 0x015A\r
-#define GPUREG_015B 0x015B\r
+#define GPUREG_LIGHT1_CONFIG 0x0159\r
+#define GPUREG_LIGHT1_ATTENUATION_BIAS 0x015A\r
+#define GPUREG_LIGHT1_ATTENUATION_SCALE 0x015B\r
 #define GPUREG_015C 0x015C\r
 #define GPUREG_015D 0x015D\r
 #define GPUREG_015E 0x015E\r
 #define GPUREG_015F 0x015F\r
-#define GPUREG_0160 0x0160\r
-#define GPUREG_0161 0x0161\r
-#define GPUREG_0162 0x0162\r
-#define GPUREG_0163 0x0163\r
-#define GPUREG_0164 0x0164\r
-#define GPUREG_0165 0x0165\r
-#define GPUREG_0166 0x0166\r
-#define GPUREG_0167 0x0167\r
+#define GPUREG_LIGHT2_SPECULAR0 0x0160\r
+#define GPUREG_LIGHT2_SPECULAR1 0x0161\r
+#define GPUREG_LIGHT2_DIFFUSE 0x0162\r
+#define GPUREG_LIGHT2_AMBIENT 0x0163\r
+#define GPUREG_LIGHT2_XY 0x0164\r
+#define GPUREG_LIGHT2_Z 0x0165\r
+#define GPUREG_LIGHT2_SPOTDIR_XY 0x0166\r
+#define GPUREG_LIGHT2_SPOTDIR_Z 0x0167\r
 #define GPUREG_0168 0x0168\r
-#define GPUREG_0169 0x0169\r
-#define GPUREG_016A 0x016A\r
-#define GPUREG_016B 0x016B\r
+#define GPUREG_LIGHT2_CONFIG 0x0169\r
+#define GPUREG_LIGHT2_ATTENUATION_BIAS 0x016A\r
+#define GPUREG_LIGHT2_ATTENUATION_SCALE 0x016B\r
 #define GPUREG_016C 0x016C\r
 #define GPUREG_016D 0x016D\r
 #define GPUREG_016E 0x016E\r
 #define GPUREG_016F 0x016F\r
-#define GPUREG_0170 0x0170\r
-#define GPUREG_0171 0x0171\r
-#define GPUREG_0172 0x0172\r
-#define GPUREG_0173 0x0173\r
-#define GPUREG_0174 0x0174\r
-#define GPUREG_0175 0x0175\r
-#define GPUREG_0176 0x0176\r
-#define GPUREG_0177 0x0177\r
+#define GPUREG_LIGHT3_SPECULAR0 0x0170\r
+#define GPUREG_LIGHT3_SPECULAR1 0x0171\r
+#define GPUREG_LIGHT3_DIFFUSE 0x0172\r
+#define GPUREG_LIGHT3_AMBIENT 0x0173\r
+#define GPUREG_LIGHT3_XY 0x0174\r
+#define GPUREG_LIGHT3_Z 0x0175\r
+#define GPUREG_LIGHT3_SPOTDIR_XY 0x0176\r
+#define GPUREG_LIGHT3_SPOTDIR_Z 0x0177\r
 #define GPUREG_0178 0x0178\r
-#define GPUREG_0179 0x0179\r
-#define GPUREG_017A 0x017A\r
-#define GPUREG_017B 0x017B\r
+#define GPUREG_LIGHT3_CONFIG 0x0179\r
+#define GPUREG_LIGHT3_ATTENUATION_BIAS 0x017A\r
+#define GPUREG_LIGHT3_ATTENUATION_SCALE 0x017B\r
 #define GPUREG_017C 0x017C\r
 #define GPUREG_017D 0x017D\r
 #define GPUREG_017E 0x017E\r
 #define GPUREG_017F 0x017F\r
-#define GPUREG_0180 0x0180\r
-#define GPUREG_0181 0x0181\r
-#define GPUREG_0182 0x0182\r
-#define GPUREG_0183 0x0183\r
-#define GPUREG_0184 0x0184\r
-#define GPUREG_0185 0x0185\r
-#define GPUREG_0186 0x0186\r
-#define GPUREG_0187 0x0187\r
+#define GPUREG_LIGHT4_SPECULAR0 0x0180\r
+#define GPUREG_LIGHT4_SPECULAR1 0x0181\r
+#define GPUREG_LIGHT4_DIFFUSE 0x0182\r
+#define GPUREG_LIGHT4_AMBIENT 0x0183\r
+#define GPUREG_LIGHT4_XY 0x0184\r
+#define GPUREG_LIGHT4_Z 0x0185\r
+#define GPUREG_LIGHT4_SPOTDIR_XY 0x0186\r
+#define GPUREG_LIGHT4_SPOTDIR_Z 0x0187\r
 #define GPUREG_0188 0x0188\r
-#define GPUREG_0189 0x0189\r
-#define GPUREG_018A 0x018A\r
-#define GPUREG_018B 0x018B\r
+#define GPUREG_LIGHT4_CONFIG 0x0189\r
+#define GPUREG_LIGHT4_ATTENUATION_BIAS 0x018A\r
+#define GPUREG_LIGHT4_ATTENUATION_SCALE 0x018B\r
 #define GPUREG_018C 0x018C\r
 #define GPUREG_018D 0x018D\r
 #define GPUREG_018E 0x018E\r
 #define GPUREG_018F 0x018F\r
-#define GPUREG_0190 0x0190\r
-#define GPUREG_0191 0x0191\r
-#define GPUREG_0192 0x0192\r
-#define GPUREG_0193 0x0193\r
-#define GPUREG_0194 0x0194\r
-#define GPUREG_0195 0x0195\r
-#define GPUREG_0196 0x0196\r
-#define GPUREG_0197 0x0197\r
+#define GPUREG_LIGHT5_SPECULAR0 0x0190\r
+#define GPUREG_LIGHT5_SPECULAR1 0x0191\r
+#define GPUREG_LIGHT5_DIFFUSE 0x0192\r
+#define GPUREG_LIGHT5_AMBIENT 0x0193\r
+#define GPUREG_LIGHT5_XY 0x0194\r
+#define GPUREG_LIGHT5_Z 0x0195\r
+#define GPUREG_LIGHT5_SPOTDIR_XY 0x0196\r
+#define GPUREG_LIGHT5_SPOTDIR_Z 0x0197\r
 #define GPUREG_0198 0x0198\r
-#define GPUREG_0199 0x0199\r
-#define GPUREG_019A 0x019A\r
-#define GPUREG_019B 0x019B\r
+#define GPUREG_LIGHT5_CONFIG 0x0199\r
+#define GPUREG_LIGHT5_ATTENUATION_BIAS 0x019A\r
+#define GPUREG_LIGHT5_ATTENUATION_SCALE 0x019B\r
 #define GPUREG_019C 0x019C\r
 #define GPUREG_019D 0x019D\r
 #define GPUREG_019E 0x019E\r
 #define GPUREG_019F 0x019F\r
-#define GPUREG_01A0 0x01A0\r
-#define GPUREG_01A1 0x01A1\r
-#define GPUREG_01A2 0x01A2\r
-#define GPUREG_01A3 0x01A3\r
-#define GPUREG_01A4 0x01A4\r
-#define GPUREG_01A5 0x01A5\r
-#define GPUREG_01A6 0x01A6\r
-#define GPUREG_01A7 0x01A7\r
+#define GPUREG_LIGHT6_SPECULAR0 0x01A0\r
+#define GPUREG_LIGHT6_SPECULAR1 0x01A1\r
+#define GPUREG_LIGHT6_DIFFUSE 0x01A2\r
+#define GPUREG_LIGHT6_AMBIENT 0x01A3\r
+#define GPUREG_LIGHT6_XY 0x01A4\r
+#define GPUREG_LIGHT6_Z 0x01A5\r
+#define GPUREG_LIGHT6_SPOTDIR_XY 0x01A6\r
+#define GPUREG_LIGHT6_SPOTDIR_Z 0x01A7\r
 #define GPUREG_01A8 0x01A8\r
-#define GPUREG_01A9 0x01A9\r
-#define GPUREG_01AA 0x01AA\r
-#define GPUREG_01AB 0x01AB\r
+#define GPUREG_LIGHT6_CONFIG 0x01A9\r
+#define GPUREG_LIGHT6_ATTENUATION_BIAS 0x01AA\r
+#define GPUREG_LIGHT6_ATTENUATION_SCALE 0x01AB\r
 #define GPUREG_01AC 0x01AC\r
 #define GPUREG_01AD 0x01AD\r
 #define GPUREG_01AE 0x01AE\r
 #define GPUREG_01AF 0x01AF\r
-#define GPUREG_01B0 0x01B0\r
-#define GPUREG_01B1 0x01B1\r
-#define GPUREG_01B2 0x01B2\r
-#define GPUREG_01B3 0x01B3\r
-#define GPUREG_01B4 0x01B4\r
-#define GPUREG_01B5 0x01B5\r
-#define GPUREG_01B6 0x01B6\r
-#define GPUREG_01B7 0x01B7\r
+#define GPUREG_LIGHT7_SPECULAR0 0x01B0\r
+#define GPUREG_LIGHT7_SPECULAR1 0x01B1\r
+#define GPUREG_LIGHT7_DIFFUSE 0x01B2\r
+#define GPUREG_LIGHT7_AMBIENT 0x01B3\r
+#define GPUREG_LIGHT7_XY 0x01B4\r
+#define GPUREG_LIGHT7_Z 0x01B5\r
+#define GPUREG_LIGHT7_SPOTDIR_XY 0x01B6\r
+#define GPUREG_LIGHT7_SPOTDIR_Z 0x01B7\r
 #define GPUREG_01B8 0x01B8\r
-#define GPUREG_01B9 0x01B9\r
-#define GPUREG_01BA 0x01BA\r
-#define GPUREG_01BB 0x01BB\r
+#define GPUREG_LIGHT7_CONFIG 0x01B9\r
+#define GPUREG_LIGHT7_ATTENUATION_BIAS 0x01BA\r
+#define GPUREG_LIGHT7_ATTENUATION_SCALE 0x01BB\r
 #define GPUREG_01BC 0x01BC\r
 #define GPUREG_01BD 0x01BD\r
 #define GPUREG_01BE 0x01BE\r
 #define GPUREG_01BF 0x01BF\r
-#define GPUREG_01C0 0x01C0\r
+#define GPUREG_LIGHTING_AMBIENT 0x01C0\r
 #define GPUREG_01C1 0x01C1\r
-#define GPUREG_01C2 0x01C2\r
-#define GPUREG_01C3 0x01C3\r
-#define GPUREG_01C4 0x01C4\r
-#define GPUREG_01C5 0x01C5\r
-#define GPUREG_01C6 0x01C6\r
+#define GPUREG_LIGHTING_NUM_LIGHTS 0x01C2\r
+#define GPUREG_LIGHTING_CONFIG0 0x01C3\r
+#define GPUREG_LIGHTING_CONFIG1 0x01C4\r
+#define GPUREG_LIGHTING_LUT_INDEX 0x01C5\r
+#define GPUREG_LIGHTING_ENABLE1 0x01C6\r
 #define GPUREG_01C7 0x01C7\r
-#define GPUREG_01C8 0x01C8\r
-#define GPUREG_01C9 0x01C9\r
-#define GPUREG_01CA 0x01CA\r
-#define GPUREG_01CB 0x01CB\r
-#define GPUREG_01CC 0x01CC\r
-#define GPUREG_01CD 0x01CD\r
-#define GPUREG_01CE 0x01CE\r
-#define GPUREG_01CF 0x01CF\r
-#define GPUREG_01D0 0x01D0\r
-#define GPUREG_01D1 0x01D1\r
-#define GPUREG_01D2 0x01D2\r
+#define GPUREG_LIGHTING_LUT_DATA0 0x01C8\r
+#define GPUREG_LIGHTING_LUT_DATA1 0x01C9\r
+#define GPUREG_LIGHTING_LUT_DATA2 0x01CA\r
+#define GPUREG_LIGHTING_LUT_DATA3 0x01CB\r
+#define GPUREG_LIGHTING_LUT_DATA4 0x01CC\r
+#define GPUREG_LIGHTING_LUT_DATA5 0x01CD\r
+#define GPUREG_LIGHTING_LUT_DATA6 0x01CE\r
+#define GPUREG_LIGHTING_LUT_DATA7 0x01CF\r
+#define GPUREG_LIGHTING_LUTINPUT_ABS 0x01D0\r
+#define GPUREG_LIGHTING_LUTINPUT_SELECT 0x01D1\r
+#define GPUREG_LIGHTING_LUTINPUT_SCALE 0x01D2\r
 #define GPUREG_01D3 0x01D3\r
 #define GPUREG_01D4 0x01D4\r
 #define GPUREG_01D5 0x01D5\r
 #define GPUREG_01D6 0x01D6\r
 #define GPUREG_01D7 0x01D7\r
 #define GPUREG_01D8 0x01D8\r
-#define GPUREG_01D9 0x01D9\r
+#define GPUREG_LIGHTING_LIGHT_PERMUTATION 0x01D9\r
 #define GPUREG_01DA 0x01DA\r
 #define GPUREG_01DB 0x01DB\r
 #define GPUREG_01DC 0x01DC\r

diff --git a/libctru/source/gpu/gpu.c b/libctru/source/gpu/gpu.c
index b97b006564c51e806c58aab27ebabd020046f8f2..90fd34ba6ca7b1c49a67d7e414b666bddadd4a1c 100644 (file)
--- a/libctru/source/gpu/gpu.c
+++ b/libctru/source/gpu/gpu.c
@@ -96,6 +96,68 @@ static inline u32 floatrawbits(float f)
        return s.i;
 }
 
+// f16 has:
+//  - 1 sign bit
+//  - 5 exponent bits
+//  - 10 mantissa bits
+u32 f32tof16(float f)
+{
+       u32 i = floatrawbits(f);
+
+       u32 mantissa = (i << 9) >>  9;
+       s32 exponent = (i << 1) >> 24;
+       u32 sign     = (i << 0) >> 31;
+
+       // Truncate mantissa
+       mantissa >>= 13;
+
+       // Re-bias exponent
+       exponent = exponent - 127 + 15;
+       if (exponent < 0)
+       {
+               // Underflow: flush to zero
+               return sign << 15;
+       }
+       else if (exponent > 0x1F)
+       {
+               // Overflow: saturate to infinity
+               return sign << 15 | 0x1F << 10;
+       }
+
+       return sign << 15 | exponent << 10 | mantissa;
+}
+
+// f20 has:
+//  - 1 sign bit
+//  - 7 exponent bits
+//  - 12 mantissa bits
+u32 f32tof20(float f)
+{
+       u32 i = floatrawbits(f);
+
+       u32 mantissa = (i << 9) >>  9;
+       s32 exponent = (i << 1) >> 24;
+       u32 sign     = (i << 0) >> 31;
+
+       // Truncate mantissa
+       mantissa >>= 11;
+
+       // Re-bias exponent
+       exponent = exponent - 127 + 63;
+       if (exponent < 0)
+       {
+               // Underflow: flush to zero
+               return sign << 19;
+       }
+       else if (exponent > 0x7F)
+       {
+               // Overflow: saturate to infinity
+               return sign << 19 | 0x7F << 12;
+       }
+
+       return sign << 19 | exponent << 12 | mantissa;
+}
+
 // f24 has:
 //  - 1 sign bit
 //  - 7 exponent bits