Changeset 1074Tweet

Timestamp:

Nov 17, 2011, 4:42:44 PM (12 years ago)

Author:

gary

Message:

tutorial: create texture with the proper format and type on the PS3.

File:

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

trunk/test/tutorial/tut03.cpp

@@ -31 +31 @@
 #endif
 
+#ifdef __CELLOS_LV2__
+static GLint const INTERNAL_FORMAT = GL_ARGB_SCE;
+static GLenum const TEXTURE_FORMAT = GL_BGRA;
+static GLenum const TEXTURE_TYPE = GL_UNSIGNED_INT_8_8_8_8_REV;
+#else
+/* Seems efficient for little endian textures */
+static GLint const INTERNAL_FORMAT = GL_RGBA;
+static GLenum const TEXTURE_FORMAT = GL_BGRA;
+static GLenum const TEXTURE_TYPE = GL_UNSIGNED_INT_8_8_8_8_REV;
+#endif
+
 class Fractal : public WorldEntity
 {
@@ -136 +147 @@
             double oldradius = m_radius;
 #ifdef __CELLOS_LV2__
-            m_radius *= pow(2.0, -deltams * 0.0005);
+            m_radius *= pow(2.0, -deltams * 0.00005);
             m_center = f64cmplx(0.001643721971153, 0.822467633298876);
 #else
@@ -178 +189 @@
         if (m_dirty[m_frame])
         {
+            double const maxsqlen = 1024;
+            double const k1 = 1.0 / (1 << 10) / log2(maxsqlen);
+
             m_dirty[m_frame]--;
 
@@ -183 +197 @@
             for (int i = m_frame % 2; i < m_size.x; i += 2)
             {
-                double const maxsqlen = 1024;
 
                 f64cmplx z0 = m_center + TexelToWorldOffset(ivec2(i, j));
@@ -207 +220 @@
                     union { double n; uint64_t x; } u = { n };
                     double k = (u.x >> 42) - (((1 << 10) - 1) << 10);
-                    k *= 1.0 / (1 << 10) / log2(maxsqlen);
+                    k *= k1;
 
                     /* Approximate log2(k) in [1,2]. */
@@ -254 +267 @@
             glGenTextures(1, &m_texid);
             glBindTexture(GL_TEXTURE_2D, m_texid);
-            glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_size.x / 2, m_size.y * 2,
-                         0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, m_pixels);
+            glTexImage2D(GL_TEXTURE_2D, 0, INTERNAL_FORMAT,
+                         m_size.x / 2, m_size.y * 2, 0,
+                         TEXTURE_FORMAT, TEXTURE_TYPE, m_pixels);
+#if !defined __CELLOS_LV2__
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_ALLOCATION_HINT_SCE,
+                            GL_TEXTURE_TILED_GPU_SCE);
+#endif
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -412 +430 @@
             glTexSubImage2D(GL_TEXTURE_2D, 0, 0, m_frame * m_size.y / 2,
                             m_size.x / 2, m_size.y / 2,
-                            GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
+                            TEXTURE_FORMAT, TEXTURE_TYPE,
                             m_pixels + m_size.x * m_size.y / 4 * m_frame);
         }
@@ -423 +441 @@
             glTexSubImage2D(GL_TEXTURE_2D, 0, 0, i * m_size.y / 2,
                             m_size.x / 2, m_size.y / 2,
-                            GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
+                            TEXTURE_FORMAT, TEXTURE_TYPE,
                             m_pixels + m_size.x * m_size.y / 4 * m_frame);
     }