Changeset 1216Tweet

Timestamp:

Apr 11, 2012, 2:27:58 PM (11 years ago)

Author:

sam

Message:

tutorial: fix the texture swizzling for the fractal viewer on Xbox 360.

File:

• trunk/test/tutorial/tut03.cpp (modified) (8 diffs)

trunk/test/tutorial/tut03.cpp

@@ -99 +99 @@
             m_dirty[i] = 2;
         }
-#if defined __CELLOS_LV2__
+#if defined __CELLOS_LV2__ || defined _XBOX
         //m_center = f64cmplx(-.22815528839841, -1.11514249704382);
         //m_center = f64cmplx(0.001643721971153, 0.822467633298876);
@@ -133 +133 @@
             uint8_t green = g * 255.99f;
             uint8_t blue = b * 255.99f;
-#if defined __CELLOS_LV2__
+#if defined __CELLOS_LV2__ || defined _XBOX
             m_palette[i] = u8vec4(255, red, green, blue);
 #elif defined __native_client__
@@ -214 +214 @@
 
         ivec3 buttons = Input::GetMouseButtons();
-#if !defined __CELLOS_LV2__
+#if !defined __CELLOS_LV2__ && !defined _XBOX
         if (buttons[1])
         {
@@ -274 +274 @@
             }
             m_radius *= zoom;
-#if !defined __CELLOS_LV2__
+#if !defined __CELLOS_LV2__ && !defined _XBOX
             m_center += m_translate;
             m_center = (m_center - worldmouse) * zoom + worldmouse;
@@ -419 +419 @@
             else
             {
-#if defined __CELLOS_LV2__
+#if defined __CELLOS_LV2__ || defined _XBOX
                 *m_pixelstart++ = u8vec4(255, 0, 0, 0);
 #else
@@ -470 +470 @@
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+#elif defined _XBOX
+            /* By default the X360 will swizzle the texture. Ask for linear. */
+            g_d3ddevice->CreateTexture(m_size.x / 2, m_size.y * 2, 1,
+                                       D3DUSAGE_WRITEONLY, D3DFMT_LIN_A8R8G8B8,
+                                       D3DPOOL_DEFAULT, &m_tex, NULL);
 #else
             g_d3ddevice->CreateTexture(m_size.x / 2, m_size.y * 2, 1,
@@ -733 +738 @@
 #if defined _XBOX || defined USE_D3D9
             D3DLOCKED_RECT rect;
+#   if defined _XBOX
+            m_tex->LockRect(0, &rect, NULL, D3DLOCK_NOOVERWRITE);
+#   else
             m_tex->LockRect(0, &rect, NULL,
                             D3DLOCK_DISCARD | D3DLOCK_NOOVERWRITE);
+#   endif
             for (int j = 0; j < m_size.y * 2; j++)
             {
@@ -859 +868 @@
 int main(int argc, char **argv)
 {
-    Application app("Tutorial 3: Fractal", ivec2(640, 480), 60.0f);
-
-#if defined _MSC_VER
+    Application app("Tutorial 3: Fractal", ivec2(640, 480, 60.0f);
+
+#if defined _MSC_VER && !defined _XBOX
     _chdir("..");
-#elif defined _WIN32
+#elif defined _WIN32 && !defined _XBOX
     _chdir("../..");
 #endif