projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Add codes for Dali Windows Backend
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
render
/
renderers
/
render-texture.h
diff --git
a/dali/internal/render/renderers/render-texture.h
b/dali/internal/render/renderers/render-texture.h
old mode 100644
(file)
new mode 100755
(executable)
index
db5988b
..
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
/*
#define DALI_INTERNAL_RENDER_TEXTURE_H
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-21,6
+21,7
@@
#include <string>
// INTERNAL INCLUDES
#include <string>
// INTERNAL INCLUDES
+#include <dali/public-api/images/image-operations.h> // Dali::ImageDimensions
#include <dali/public-api/rendering/sampler.h>
#include <dali/public-api/rendering/texture.h>
#include <dali/internal/event/rendering/texture-impl.h>
#include <dali/public-api/rendering/sampler.h>
#include <dali/public-api/rendering/texture.h>
#include <dali/internal/event/rendering/texture-impl.h>
@@
-46,10
+47,9
@@
public:
* Constructor
* @param[in] type The type of the texture
* @param[in] format The format of the pixel data
* Constructor
* @param[in] type The type of the texture
* @param[in] format The format of the pixel data
- * @param[in] width The width of the texture
- * @param[in] height The height of the texture
+ * @param[in] size The size of the texture
*/
*/
- Texture( Type type, Pixel::Format format,
unsigned int width, unsigned int height
);
+ Texture( Type type, Pixel::Format format,
ImageDimensions size
);
/**
* Constructor from native image
/**
* Constructor from native image
@@
-67,7
+67,7
@@
public:
* Creates the texture and reserves memory for the first mipmap level
* @param[in] context The GL context
*/
* 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
/**
* Deletes the texture from the GPU
@@
-119,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 m
Height
;
+ return m
Type
;
}
/**
}
/**
- *
Get the type of the textur
e
- * @return
Type of the textur
e
+ *
Check if the texture is a native imag
e
+ * @return
if the texture is a native imag
e
*/
*/
-
Type GetTyp
e() const
+
bool IsNativeImag
e() const
{
{
- return m
Typ
e;
+ return m
NativeImag
e;
}
private:
}
private:
@@
-154,17
+145,20
@@
private:
*/
void ApplySampler( Context& context, Render::Sampler* sampler );
*/
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.
GLuint mId; ///< Id of the texture
GLuint mTarget; ///< Specifies the target to which the texture is bound.
- Type mType; ///< Type of the texture
- Render::Sampler mSampler; ///< The current sampler state
- NativeImageInterfacePtr mNativeImage; ///< Pointer to native image
- GLenum mInternalFormat; ///< The format of the pixel data
+ 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
GLenum mPixelDataType; ///< The data type of the pixel data
- unsigned int mWidth; ///< Widht of the texture
- unsigned int mHeight; ///< Height of the texture
+ 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
bool mHasAlpha : 1; ///< Whether the format has an alpha channel
bool mIsCompressed : 1; ///< Whether the format is compressed
+
};
};