X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Frenderers%2Frender-texture.h;h=771fca072acc8cdd1f26ee8dc64aac114580284c;hb=4d75040ab200bd306ec5a48f2a617480062eef4c;hp=8b021237e4d3a3f36c428c8e2593bcdfe0251b4d;hpb=c0ae5af3c1916a8efa0fe62cb27c77314bae000a;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/render/renderers/render-texture.h b/dali/internal/render/renderers/render-texture.h old mode 100644 new mode 100755 index 8b02123..771fca0 --- a/dali/internal/render/renderers/render-texture.h +++ b/dali/internal/render/renderers/render-texture.h @@ -2,7 +2,7 @@ #define DALI_INTERNAL_RENDER_TEXTURE_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,14 +21,13 @@ #include // INTERNAL INCLUDES -#include -#include +#include // Dali::ImageDimensions +#include +#include #include -#include - #include -#include #include +#include namespace Dali { @@ -38,93 +37,37 @@ namespace Render { struct Sampler; -/** - * This class is the mapping between texture id, sampler and sampler uniform name - */ class Texture { public: - /** - * Enumeration to tell that this sampler does not have a unique index yet - */ - enum - { - NOT_INITIALIZED = -1 - }; - - /** - * Constructor - */ - Texture() - : mSampler( 0 ), - mTextureId( Integration::InvalidResourceId ) - {} + typedef Dali::TextureType::Type Type; /** * Constructor + * @param[in] type The type of the texture + * @param[in] format The format of the pixel data + * @param[in] size The size of the texture */ - Texture( Integration::ResourceId textureId, Render::Sampler* sampler ) - : mSampler( sampler ), - mTextureId( textureId) - {} - - /** - * Destructor - */ - ~Texture() - {} - - /* - * Get the Render::Sampler used by the texture - * @Return The Render::Sampler being used or 0 if using the default - */ - inline const Render::Sampler* GetSampler() const - { - return mSampler; - } - -public: // called from RenderThread - - /** - * @param[in] buffer A vector wit - * Get the texture ID - * @return the id of the associated texture - */ - inline Integration::ResourceId GetTextureId() const - { - return mTextureId; - } + Texture( Type type, Pixel::Format format, ImageDimensions size ); -private: - - Render::Sampler* mSampler; - Integration::ResourceId mTextureId; -}; - - -//TODO : Remove the old Render::Texture class (see above) once it is no longer needed by Image -class NewTexture -{ -public: - - typedef Dali::TextureType::Type Type; /** - * Constructor + * Constructor from native image + * @param[in] nativeImageInterface The native image */ - NewTexture( Type type, Pixel::Format format, unsigned int width, unsigned int height ); + Texture( NativeImageInterfacePtr nativeImageInterface ); /** * Destructor */ - ~NewTexture(); + ~Texture(); /** * Creates the texture in the GPU. * Creates the texture and reserves memory for the first mipmap level * @param[in] context The GL context */ - void Initialize(Context& context); + void Initialize( Context& context ); /** * Deletes the texture from the GPU @@ -133,20 +76,26 @@ public: void Destroy( Context& context ); /** + * Called by RenderManager to inform the texture that the context has been destroyed + */ + void GlContextDestroyed(); + + /** * Uploads data to the texture. * @param[in] context The GL context - * @param[in] buffer A vector with the data to be uploaded + * @param[in] pixelData A pixel data object * @param[in] params Upload parameters. See UploadParams */ - void Upload( Context& context, Vector& buffer, const Internal::NewTexture::UploadParams& params ); + void Upload( Context& context, PixelDataPtr pixelData, const Internal::Texture::UploadParams& params ); /** * Bind the texture to the given texture unit and applies the given sampler * @param[in] context The GL context * @param[in] textureUnit the texture unit * @param[in] sampler The sampler to be used with the texture + * @return true if the bind succeeded, false otherwise */ - void Bind( Context& context, unsigned int textureUnit, Render::Sampler* sampler ); + bool Bind( Context& context, unsigned int textureUnit, Render::Sampler* sampler ); /** * Auto generates mipmaps for the texture @@ -170,30 +119,21 @@ public: } /** - * Get the width of the texture - * @return Width of the texture - */ - unsigned int GetWidth() const - { - return mWidth; - } - - /** - * Get the height of the texture - * @return Height of the texture + * Get the type of the texture + * @return Type of the texture */ - unsigned int GetHeight() const + Type GetType() const { - return mHeight; + return mType; } /** - * Get the type of the texture - * @return Type of the texture + * Check if the texture is a native image + * @return if the texture is a native image */ - Type GetType() const + bool IsNativeImage() const { - return mType; + return mNativeImage; } private: @@ -205,15 +145,20 @@ private: */ void ApplySampler( Context& context, Render::Sampler* sampler ); + NativeImageInterfacePtr mNativeImage; ///< Pointer to native image + Render::Sampler mSampler; ///< The current sampler state + GLuint mId; ///< Id of the texture + GLuint mTarget; ///< Specifies the target to which the texture is bound. + GLint mGlInternalFormat; ///< The gl internal format of the pixel data + GLenum mGlFormat; ///< The gl format of the pixel data + GLenum mPixelDataType; ///< The data type of the pixel data + uint16_t mWidth; ///< Width of the texture + uint16_t mHeight; ///< Height of the texture + uint16_t mMaxMipMapLevel; ///< Maximum mipmap level + Type mType:3; ///< Type of the texture + bool mHasAlpha : 1; ///< Whether the format has an alpha channel + bool mIsCompressed : 1; ///< Whether the format is compressed - GLuint mId; ///