Changeset 2787
- Timestamp:
- Jun 24, 2013, 4:42:40 PM (9 years ago)
- Location:
- trunk/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/gpu/framebuffer.cpp
r2770 r2787 20 20 # define NEAR 21 21 # include <d3d9.h> 22 #elif defined _XBOX 23 # include <xtl.h> 24 # undef near /* Fuck Microsoft */ 25 # undef far /* Fuck Microsoft again */ 22 26 #endif 23 27 … … 45 49 IDirect3DSurface9 *m_surface, *m_back_surface; 46 50 #elif defined _XBOX 47 D3DDevice 9*m_dev;51 D3DDevice *m_dev; 48 52 D3DTexture *m_texture; 49 53 D3DSurface *m_surface, *m_back_surface; … … 62 66 switch (m_format) 63 67 { 64 #if defined USE_D3D9 || defined _XBOX68 #if defined USE_D3D9 65 69 case R_16_F: return D3DFMT_R16F; 66 70 case R_32_F: return D3DFMT_R32F; … … 73 77 case RGB_8_I: 74 78 case RGB_8_UI: return D3DFMT_R8G8B8; 79 case RGBA_8: 80 case RGBA_8_I: 81 case RGBA_8_UI: return D3DFMT_A8R8G8B8; 82 case RGBA_16: 83 case RGBA_16_I: 84 case RGBA_16_UI: return D3DFMT_A16B16G16R16; 85 case RGBA_16_F: return D3DFMT_A16B16G16R16F; 86 case RGBA_32_F: return D3DFMT_A32B32G32R32F; 87 #elif defined _XBOX 88 case R_16_F: return D3DFMT_R16F; 89 case R_32_F: return D3DFMT_R32F; 90 case RG_16: 91 case RG_16_I: 92 case RG_16_UI: return D3DFMT_G16R16; 93 case RG_16_F: return D3DFMT_G16R16F; 94 case RG_32_F: return D3DFMT_G32R32F; 95 case RGB_8: 96 case RGB_8_I: 97 case RGB_8_UI: return D3DFMT_X8R8G8B8; 75 98 case RGBA_8: 76 99 case RGBA_8_I: … … 292 315 293 316 if (FAILED(m_data->m_dev->CreateTexture(size.x, size.y, 1, 294 D3DUSAGE_RENDERTARGET, 295 (D3DFORMAT)fbo_format.GetFormat(), D3DPOOL_DEFAULT, 296 &m_data->m_texture, nullptr))) 317 D3DUSAGE_RENDERTARGET, 318 (D3DFORMAT)fbo_format.GetFormat(), 319 D3DPOOL_DEFAULT, 320 &m_data->m_texture, nullptr))) 297 321 Abort(); 298 322 if (FAILED(m_data->m_texture->GetSurfaceLevel(0, &m_data->m_surface))) 299 323 Abort(); 300 324 #elif defined _XBOX 301 m_data->m_dev = (D3DDevice 9*)g_renderer->GetDevice();325 m_data->m_dev = (D3DDevice *)g_renderer->GetDevice(); 302 326 303 327 if (FAILED(m_data->m_dev->CreateTexture(size.x, size.y, 1, 0, 304 fbo_format.GetFormat(), D3DPOOL_DEFAULT, 305 &m_data->m_texture, nullptr))) 328 (D3DFORMAT)fbo_format.GetFormat(), 329 D3DPOOL_DEFAULT, 330 &m_data->m_texture, nullptr))) 306 331 Abort(); 307 332 if (FAILED(m_data->m_dev->CreateRenderTarget(size.x, size.y, 308 fbo_format.GetFormat(),309 D3DMULTISAMPLE_NONE, 0, 0,310 &m_data->m_surface, nullptr)))333 (D3DFORMAT)fbo_format.GetFormat(), 334 D3DMULTISAMPLE_NONE, 0, 0, 335 &m_data->m_surface, nullptr))) 311 336 Abort(); 312 337 #else -
trunk/src/gpu/indexbuffer.cpp
r2770 r2787 20 20 # define NEAR 21 21 # include <d3d9.h> 22 #elif defined _XBOX 23 # include <xtl.h> 24 # undef near /* Fuck Microsoft */ 25 # undef far /* Fuck Microsoft again */ 22 26 #endif 23 27 … … 42 46 IDirect3DIndexBuffer9 *m_ibo; 43 47 #elif defined _XBOX 44 D3DDevice 9*m_dev;48 D3DDevice *m_dev; 45 49 D3DIndexBuffer *m_ibo; 46 50 #else … … 65 69 m_data->m_dev = (IDirect3DDevice9 *)g_renderer->GetDevice(); 66 70 # elif defined _XBOX 67 m_data->m_dev = (D3DDevice 9*)g_renderer->GetDevice();71 m_data->m_dev = (D3DDevice *)g_renderer->GetDevice(); 68 72 # endif 69 73 -
trunk/src/gpu/renderer.cpp
r2777 r2787 98 98 XGetVideoMode(&VideoMode); 99 99 size = lol::min(size, ivec2(VideoMode.dwDisplayWidth, 100 VideoMode.dwDisplayHeight) ;100 VideoMode.dwDisplayHeight)); 101 101 # endif 102 102 D3DPRESENT_PARAMETERS d3dpp; -
trunk/src/gpu/shader.cpp
r2770 r2787 16 16 #include <cstdio> 17 17 18 #if def WIN3218 #if defined WIN32 && !defined _XBOX 19 19 # define WIN32_LEAN_AND_MEAN 20 20 # include <windows.h> … … 26 26 # include <d3dx9shader.h> 27 27 # endif 28 #elif defined _XBOX 29 # include <xtl.h> 30 # undef near /* Fuck Microsoft */ 31 # undef far /* Fuck Microsoft again */ 28 32 #endif 29 33 … … 51 55 ID3DXConstantTable *vert_table, *frag_table; 52 56 #elif defined _XBOX 53 D3DDevice 9*m_dev;57 D3DDevice *m_dev; 54 58 D3DVertexShader *vert_shader; 55 59 D3DPixelShader *frag_shader; … … 193 197 data->m_dev = (IDirect3DDevice9 *)g_renderer->GetDevice(); 194 198 # elif defined _XBOX 195 data->m_dev = (D3DDevice 9*)g_renderer->GetDevice();199 data->m_dev = (D3DDevice *)g_renderer->GetDevice(); 196 200 # endif 197 201 -
trunk/src/gpu/texture.cpp
r2777 r2787 46 46 D3DTEXTUREFILTERTYPE m_mip_filter; 47 47 #elif defined _XBOX 48 D3DDevice 9*m_dev;48 D3DDevice *m_dev; 49 49 D3DTexture *m_texture; 50 D3DTEXTUREFILTERTYPE m_mag_filter; 51 D3DTEXTUREFILTERTYPE m_min_filter; 52 D3DTEXTUREFILTERTYPE m_mip_filter; 50 53 #else 51 54 GLuint m_texture; … … 75 78 m_data->m_dev = (IDirect3DDevice9 *)g_renderer->GetDevice(); 76 79 # elif defined _XBOX 77 m_data->m_dev = (D3DDevice 9*)g_renderer->GetDevice();80 m_data->m_dev = (D3DDevice *)g_renderer->GetDevice(); 78 81 # endif 79 82 … … 298 301 void Texture::GenerateMipmaps() 299 302 { 300 #if defined _XBOX || defined USE_D3D9 301 m_data->m_texture->GenerateMipSubLevels(); 303 #if defined USE_D3D9 304 m_data->m_texture->->GenerateMipSubLevels(); 305 #elif defined _XBOX 306 /* FIXME: No direct mipmap generation support on X360 */ 302 307 #elif defined __CELLOS_LV2__ 303 308 glBindTexture(GL_TEXTURE_2D, m_data->m_texture); -
trunk/src/gpu/vertexbuffer.cpp
r2770 r2787 20 20 # define NEAR 21 21 # include <d3d9.h> 22 #elif defined _XBOX 23 # include <xtl.h> 24 # undef near /* Fuck Microsoft */ 25 # undef far /* Fuck Microsoft again */ 22 26 #endif 23 27 … … 43 47 IDirect3DVertexBuffer9 *m_vbo; 44 48 #elif defined _XBOX 45 D3DDevice 9*m_dev;49 D3DDevice *m_dev; 46 50 D3DVertexBuffer *m_vbo; 47 51 #else … … 65 69 IDirect3DVertexDeclaration9 *m_vdecl; 66 70 #elif defined _XBOX 67 D3DDevice 9*m_dev;71 D3DDevice *m_dev; 68 72 D3DVertexDeclaration *m_vdecl; 69 73 #else … … 565 569 m_data->m_dev = (IDirect3DDevice9 *)g_renderer->GetDevice(); 566 570 # elif defined _XBOX 567 m_data->m_dev = (D3DDevice 9*)g_renderer->GetDevice();571 m_data->m_dev = (D3DDevice *)g_renderer->GetDevice(); 568 572 # endif 569 573 … … 648 652 m_data->m_dev = (IDirect3DDevice9 *)g_renderer->GetDevice(); 649 653 # elif defined _XBOX 650 m_data->m_dev = (D3DDevice 9*)g_renderer->GetDevice();654 m_data->m_dev = (D3DDevice *)g_renderer->GetDevice(); 651 655 # endif 652 656 -
trunk/src/platform/xbox/xboxapp.cpp
r2770 r2787 64 64 65 65 #if defined _XBOX 66 D3DDevice 9 *d3d_dev = (D3DDevice9*)g_renderer->GetDevice();66 D3DDevice *d3d_dev = (D3DDevice *)g_renderer->GetDevice(); 67 67 d3d_dev->Present(nullptr, nullptr, nullptr, nullptr); 68 68 #endif
Note: See TracChangeset
for help on using the changeset viewer.