CubeMap support

Change-Id: Idbe013328b3acb5e72931f16def48df609dbdb6f

diff --git a/dali/internal/graphics/gles-impl/egl-graphics-controller.cpp b/dali/internal/graphics/gles-impl/egl-graphics-controller.cpp
index 55468005f2028c6a4bc5afd9c851824d5e1c14dc..2f3d5aaa576bb5c0ff99ce7fc0b281b5317a6278 100644 (file)
--- a/dali/internal/graphics/gles-impl/egl-graphics-controller.cpp
+++ b/dali/internal/graphics/gles-impl/egl-graphics-controller.cpp
@@ -583,19 +583,52 @@ void EglGraphicsController::ProcessTextureUpdateQueue()
         sourceBuffer = &tempBuffer[0];
       }
 
-      mGlAbstraction->PixelStorei(GL_UNPACK_ALIGNMENT, 1);
-
-      mGlAbstraction->BindTexture(GL_TEXTURE_2D, texture->GetGLTexture());
-
-      mGlAbstraction->TexSubImage2D(GL_TEXTURE_2D,
-                                    info.level,
-                                    info.dstOffset2D.x,
-                                    info.dstOffset2D.y,
-                                    info.srcExtent2D.width,
-                                    info.srcExtent2D.height,
-                                    destFormat,
-                                    destType,
-                                    sourceBuffer);
+      switch(createInfo.textureType)
+      {
+        // Texture 2D
+        case Graphics::TextureType::TEXTURE_2D:
+        {
+
+          mGlAbstraction->PixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+          mGlAbstraction->BindTexture(GL_TEXTURE_2D, texture->GetGLTexture());
+
+          mGlAbstraction->TexSubImage2D(GL_TEXTURE_2D,
+                                        info.level,
+                                        info.dstOffset2D.x,
+                                        info.dstOffset2D.y,
+                                        info.srcExtent2D.width,
+                                        info.srcExtent2D.height,
+                                        destFormat,
+                                        destType,
+                                        sourceBuffer);
+          break;
+        }
+        // Texture Cubemap
+        case Graphics::TextureType::TEXTURE_CUBEMAP:
+        {
+          mGlAbstraction->PixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+          mGlAbstraction->BindTexture(GL_TEXTURE_CUBE_MAP, texture->GetGLTexture());
+
+          mGlAbstraction->TexSubImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + info.layer,
+                                        info.level,
+                                        info.dstOffset2D.x,
+                                        info.dstOffset2D.y,
+                                        info.srcExtent2D.width,
+                                        info.srcExtent2D.height,
+                                        destFormat,
+                                        destType,
+                                        sourceBuffer);
+
+
+          break;
+        }
+        default:
+        {
+          // nothing?
+        }
+      }
 
       // free staging memory
       free(source.memorySource.memory);

diff --git a/dali/internal/graphics/gles-impl/gles-graphics-texture.cpp b/dali/internal/graphics/gles-impl/gles-graphics-texture.cpp
index 7e84495cfcef836283a9e0e60a9d718939ec78e7..cb75d68d7e510e213ce51f7551f3d1b1d4341095 100644 (file)
--- a/dali/internal/graphics/gles-impl/gles-graphics-texture.cpp
+++ b/dali/internal/graphics/gles-impl/gles-graphics-texture.cpp
@@ -207,6 +207,46 @@ bool Texture::InitializeTexture()
       }
       break;
     }
+    // Texture Cubemap
+    case Graphics::TextureType::TEXTURE_CUBEMAP:
+    {
+      Graphics::GLES::GLTextureFormatType format(mCreateInfo.format);
+
+      if(format.format && format.type)
+      {
+        // Bind texture
+        gl->GenTextures(1, &texture);
+        gl->BindTexture(GL_TEXTURE_CUBE_MAP, texture);
+        gl->PixelStorei(GL_UNPACK_ALIGNMENT, 1); // We always use tightly packed data
+
+        gl->TexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, Graphics::GLES::GLSamplerFilterAndMipMapMode(Graphics::SamplerFilter::LINEAR, SamplerMipmapMode::NONE));
+        gl->TexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, Graphics::GLES::GLSamplerFilterAndMipMapMode(Graphics::SamplerFilter::LINEAR, SamplerMipmapMode::NONE));
+        gl->TexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_WRAP_DEFAULT);
+        gl->TexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_WRAP_DEFAULT);
+
+        // Allocate memory for the texture
+        for(uint32_t i = 0; i < 6; ++i)
+        {
+          gl->TexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i,
+                         0,
+                         format.format,
+                         mCreateInfo.size.width,
+                         mCreateInfo.size.height,
+                         0,
+                         format.format,
+                         format.type,
+                         (mCreateInfo.data ? mStagingBuffer.data() : nullptr));
+        }
+
+        // Clear staging buffer if there was any
+        mStagingBuffer.clear();
+
+        mTextureId = texture;
+
+        gl->TexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_WRAP_DEFAULT);
+      }
+      break;
+    }
     default:
     {
       // nothing?