diff --git a/xenon/xenon360_video.c b/xenon/xenon360_video.c index d9438903a7..f95e6923fa 100644 --- a/xenon/xenon360_video.c +++ b/xenon/xenon360_video.c @@ -39,40 +39,40 @@ // pixel shader const unsigned int g_xps_PS[] = { - 0x102a1100, 0x000000b4, 0x0000003c, 0x00000000, 0x00000024, 0x00000000, - 0x0000008c, 0x00000000, 0x00000000, 0x00000064, 0x0000001c, 0x00000057, - 0xffff0300, 0x00000001, 0x0000001c, 0x00000000, 0x00000050, 0x00000030, - 0x00030000, 0x00010000, 0x00000040, 0x00000000, 0x54657874, 0x75726553, - 0x616d706c, 0x657200ab, 0x0004000c, 0x00010001, 0x00010000, 0x00000000, - 0x70735f33, 0x5f300032, 0x2e302e32, 0x30333533, 0x2e3000ab, 0x00000000, - 0x0000003c, 0x10000100, 0x00000008, 0x00000000, 0x00001842, 0x00010003, - 0x00000001, 0x00003050, 0x0000f1a0, 0x00011002, 0x00001200, 0xc4000000, - 0x00001003, 0x00002200, 0x00000000, 0x10081001, 0x1f1ff688, 0x00004000, - 0xc80f8000, 0x00000000, 0xe2010100, 0x00000000, 0x00000000, 0x00000000 + 0x102a1100, 0x000000b4, 0x0000003c, 0x00000000, 0x00000024, 0x00000000, + 0x0000008c, 0x00000000, 0x00000000, 0x00000064, 0x0000001c, 0x00000057, + 0xffff0300, 0x00000001, 0x0000001c, 0x00000000, 0x00000050, 0x00000030, + 0x00030000, 0x00010000, 0x00000040, 0x00000000, 0x54657874, 0x75726553, + 0x616d706c, 0x657200ab, 0x0004000c, 0x00010001, 0x00010000, 0x00000000, + 0x70735f33, 0x5f300032, 0x2e302e32, 0x30333533, 0x2e3000ab, 0x00000000, + 0x0000003c, 0x10000100, 0x00000008, 0x00000000, 0x00001842, 0x00010003, + 0x00000001, 0x00003050, 0x0000f1a0, 0x00011002, 0x00001200, 0xc4000000, + 0x00001003, 0x00002200, 0x00000000, 0x10081001, 0x1f1ff688, 0x00004000, + 0xc80f8000, 0x00000000, 0xe2010100, 0x00000000, 0x00000000, 0x00000000 }; // vertex shader const unsigned int g_xvs_VS[] = { - 0x102a1101, 0x0000009c, 0x00000078, 0x00000000, 0x00000024, 0x00000000, - 0x00000058, 0x00000000, 0x00000000, 0x00000030, 0x0000001c, 0x00000023, - 0xfffe0300, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0x76735f33, - 0x5f300032, 0x2e302e32, 0x30333533, 0x2e3000ab, 0x00000000, 0x00000078, - 0x00110002, 0x00000000, 0x00000000, 0x00001842, 0x00000001, 0x00000003, - 0x00000002, 0x00000290, 0x00100003, 0x0000a004, 0x00305005, 0x00003050, - 0x0001f1a0, 0x00001007, 0x00001008, 0x70153003, 0x00001200, 0xc2000000, - 0x00001006, 0x00001200, 0xc4000000, 0x00002007, 0x00002200, 0x00000000, - 0x05f82000, 0x00000688, 0x00000000, 0x05f81000, 0x00000688, 0x00000000, - 0x05f80000, 0x00000fc8, 0x00000000, 0xc80f803e, 0x00000000, 0xe2020200, - 0xc8038000, 0x00b0b000, 0xe2000000, 0xc80f8001, 0x00000000, 0xe2010100, - 0x00000000, 0x00000000, 0x00000000 + 0x102a1101, 0x0000009c, 0x00000078, 0x00000000, 0x00000024, 0x00000000, + 0x00000058, 0x00000000, 0x00000000, 0x00000030, 0x0000001c, 0x00000023, + 0xfffe0300, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0x76735f33, + 0x5f300032, 0x2e302e32, 0x30333533, 0x2e3000ab, 0x00000000, 0x00000078, + 0x00110002, 0x00000000, 0x00000000, 0x00001842, 0x00000001, 0x00000003, + 0x00000002, 0x00000290, 0x00100003, 0x0000a004, 0x00305005, 0x00003050, + 0x0001f1a0, 0x00001007, 0x00001008, 0x70153003, 0x00001200, 0xc2000000, + 0x00001006, 0x00001200, 0xc4000000, 0x00002007, 0x00002200, 0x00000000, + 0x05f82000, 0x00000688, 0x00000000, 0x05f81000, 0x00000688, 0x00000000, + 0x05f80000, 0x00000fc8, 0x00000000, 0xc80f803e, 0x00000000, 0xe2020200, + 0xc8038000, 0x00b0b000, 0xe2000000, 0xc80f8001, 0x00000000, 0xe2010100, + 0x00000000, 0x00000000, 0x00000000 }; typedef struct DrawVerticeFormats { - float x, y, z, w; - unsigned int color; - float u, v; + float x, y, z, w; + unsigned int color; + float u, v; } DrawVerticeFormats; typedef struct xenon360_video xenon360_video_t; @@ -116,12 +116,12 @@ static void *xenon360_gfx_init(const video_info_t *video, const input_driver_t * static const struct XenosVBFFormat vbf = { - 3, - { - {XE_USAGE_POSITION, 0, XE_TYPE_FLOAT4}, - {XE_USAGE_COLOR, 0, XE_TYPE_UBYTE4}, - {XE_USAGE_TEXCOORD, 0, XE_TYPE_FLOAT2}, - } + 3, + { + {XE_USAGE_POSITION, 0, XE_TYPE_FLOAT4}, + {XE_USAGE_COLOR, 0, XE_TYPE_UBYTE4}, + {XE_USAGE_TEXCOORD, 0, XE_TYPE_FLOAT2}, + } }; gl->g_pPixelTexturedShader = Xe_LoadShaderFromMemory(gl->gl_device, (void*)g_xps_PS); @@ -180,8 +180,8 @@ static void *xenon360_gfx_init(const video_info_t *video, const input_driver_t * int i = 0; for (i = 0; i < 3; i++) { - Rect[i].z = 0.0; - Rect[i].w = 1.0; + Rect[i].z = 0.0; + Rect[i].w = 1.0; } Xe_VB_Unlock(gl->gl_device, gl->vb); @@ -215,7 +215,7 @@ static bool xenon360_gfx_frame(void *data, const void *frame, unsigned width, un unsigned stride_out = vid->g_pTexture->wpitch >> 1; unsigned copy_size =width << 1; for (unsigned y = 0; y < height; y++, dst += stride_out, src += stride_in) - memcpy(dst, src, copy_size); + memcpy(dst, src, copy_size); Xe_Surface_Unlock(vid->gl_device, vid->g_pTexture); // Reset states