Changeset 1781Tweet

Timestamp:

Aug 20, 2012, 8:15:32 PM (11 years ago)

Author:

sam

Message:

gpu: explicitly create render targets on the Xbox 360.

Location:

trunk

Files:

• build/vs2010/Lol.sln (modified) (1 diff)
• src/gpu/framebuffer.cpp (modified) (3 diffs)

trunk/build/vs2010/Lol.sln

@@ -471 +471 @@
                 {1C5B8702-290C-42DA-AA9E-671348F5B747} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
                 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
-                {BCEE0132-8E24-49BE-AFEB-96DAD14396BA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
                 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46}
                 {EE203B88-44CF-4859-9D42-7A5F40FECB52} = {8C77EAA8-1077-4EF7-AE53-97C6C60A3601}

trunk/src/gpu/framebuffer.cpp

@@ -64 +64 @@
 {
     m_data->m_size = size;
-#if defined USE_D3D9 || defined _XBOX
+#if defined USE_D3D9
     if (FAILED(g_d3ddevice->CreateTexture(size.x, size.y, 1,
                                           D3DUSAGE_RENDERTARGET,
@@ -71 +71 @@
         Abort();
     if (FAILED(m_data->m_texture->GetSurfaceLevel(0, &m_data->m_surface)))
+        Abort();
+#elif defined _XBOX
+    if (FAILED(g_d3ddevice->CreateTexture(size.x, size.y, 1, 0,
+                                          D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT,
+                                          &m_data->m_texture, NULL)))
+        Abort();
+    if (FAILED(g_d3ddevice->CreateRenderTarget(size.x, size.y,
+                                               D3DFMT_A8R8G8B8,
+                                               D3DMULTISAMPLE_NONE, 0, 0,
+                                               &m_data->m_surface, NULL)))
         Abort();
 #else
@@ -181 +191 @@
 void FrameBuffer::Unbind()
 {
-#if defined USE_D3D9 || defined _XBOX
+#if defined USE_D3D9
     if (FAILED(g_d3ddevice->SetRenderTarget(0, m_data->m_back_surface)))
         Abort();
+    m_data->m_back_surface->Release();
+#elif defined _XBOX
+    if (FAILED(g_d3ddevice->Resolve(D3DRESOLVE_RENDERTARGET0, NULL,
+                                    m_data->m_texture, NULL, 0, 0, NULL,
+                                    0, 0, NULL)))
+        Abort();
+    if (FAILED(g_d3ddevice->SetRenderTarget(0, m_data->m_back_surface)))
+        Abort();
+    m_data->m_back_surface->Release();
 #else
 #   if GL_VERSION_1_1 || GL_ES_VERSION_2_0