swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-11 21:58:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[Improvement] (MG_State/TextureState): Separate TextureStorage.h into .cpp/.h"

Browse Source 
This reverts commit 657c672899.
This commit is contained in:
BZLZHH
2025-11-28 22:37:49 +08:00
parent e72bdb67b5
commit 936abafde9
3 changed files with 78 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-1
View File
@@ -146,7 +146,6 @@ set(SOURCE_FILES
MobileGL/MG_State/GLState/TextureState/TextureObject2D.cpp MobileGL/MG_State/GLState/TextureState/TextureObject2D.cpp
MobileGL/MG_State/GLState/TextureState/TextureObject2DCube.cpp MobileGL/MG_State/GLState/TextureState/TextureObject2DCube.cpp
MobileGL/MG_State/GLState/TextureState/TextureObject3D.cpp MobileGL/MG_State/GLState/TextureState/TextureObject3D.cpp
MobileGL/MG_State/GLState/TextureState/TextureStorage.cpp
MobileGL/MG_State/GLState/TextureState/TextureUnit.cpp MobileGL/MG_State/GLState/TextureState/TextureUnit.cpp
MobileGL/MG_State/GLState/TextureState/TextureState.cpp MobileGL/MG_State/GLState/TextureState/TextureState.cpp
MobileGL/MG_State/GLState/ProgramState/ProgramObject.cpp MobileGL/MG_State/GLState/ProgramState/ProgramObject.cpp
MobileGL/MG_State/GLState/TextureState/TextureStorage.cpp
-90
View File
@@ -1,90 +0,0 @@
#include "TextureStorage.h"
namespace MobileGL {
namespace MG_State {
namespace GLState {
template <SizeT TargetCount>
TextureStorage<TargetCount>::TextureStorage() {
static_assert(TargetCount > 0, "Mipmap size must be greater than zero");
}
template <SizeT TargetCount>
void TextureStorage<TargetCount>::AllocateLevel(Uint targetIndex, Uint level, MipmapInput input) {
MOBILEGL_ASSERT(targetIndex < TargetCount, "AllocateLevel: target invalid");
auto& targetData = m_data[targetIndex];
targetData.reserve(std::bit_ceil(level + 1));
targetData.resize(level + 1);
auto& targetTexelSizes = m_texelSizes[targetIndex];
targetTexelSizes.reserve(std::bit_ceil(level + 1));
targetTexelSizes.resize(level + 1);
targetTexelSizes[level] = input.texelSize;
auto& dirtyArr = m_isDirty[targetIndex];
dirtyArr.resize(level + 1, false);
auto& data = targetData[level];
data.resize(input.byteSize, 0);
}
template <SizeT TargetCount>
void TextureStorage<TargetCount>::UpdateSubData(Uint targetIndex, Uint level, DataPtr input) {
MOBILEGL_ASSERT(targetIndex < TargetCount, "UpdateSubData: target invalid");
auto& targetData = m_data[targetIndex];
MOBILEGL_ASSERT(level < targetData.size(), "UpdateSubData: level out of range");
auto& levelData = targetData[level];
MOBILEGL_ASSERT(levelData.size() < input.size, "UpdateSubData: input data larger than allocated");
if (input.data && input.size > 0) {
const Uint8* src = static_cast<const Uint8*>(input.data);
Memcpy(levelData.data(), src, input.size);
m_isDirty[targetIndex][level] = true;
}
}
template <SizeT TargetCount>
void* TextureStorage<TargetCount>::MapData(Uint targetIndex, Uint level) {
MOBILEGL_ASSERT(targetIndex < TargetCount, "UpdateSubData: target invalid");
auto& targetData = m_data[targetIndex];
MOBILEGL_ASSERT(level < targetData.size(), "UpdateSubData: level out of range");
auto& levelData = targetData[level];
return levelData.data();
}
template <SizeT TargetCount>
IntVec3 TextureStorage<TargetCount>::GetTexelSize(Uint targetIndex, Uint level) const {
MOBILEGL_ASSERT(targetIndex < TargetCount, "GetTexelSize: target invalid");
auto& targetTexelSizes = m_texelSizes[targetIndex];
if (level >= targetTexelSizes.size()) return {0, 0, 0};
return targetTexelSizes[level];
}
template <SizeT TargetCount>
SizeT TextureStorage<TargetCount>::GetByteSize(Uint targetIndex, Uint level) const {
MOBILEGL_ASSERT(targetIndex < TargetCount, "GetByteSize: target invalid");
auto& data = m_data[targetIndex];
return data[level].size();
}
template <SizeT TargetCount>
SizeT TextureStorage<TargetCount>::GetLevelCount() const {
return m_data[0].size();
}
template <SizeT TargetCount>
void TextureStorage<TargetCount>::MarkDirty(Uint targetIndex, Uint level, bool dirty) {
MOBILEGL_ASSERT(targetIndex < TargetCount, "MarkDirty: target invalid");
MOBILEGL_ASSERT(level < m_isDirty[targetIndex].size(), "MarkDirty: level out of range");
m_isDirty[targetIndex][level] = dirty;
}
template <SizeT TargetCount>
bool TextureStorage<TargetCount>::IsDirty(Uint targetIndex, Uint level) const {
MOBILEGL_ASSERT(targetIndex < TargetCount, "IsDirty: target invalid");
MOBILEGL_ASSERT(level < m_isDirty[targetIndex].size(), "IsDirty: level out of range");
return m_isDirty[targetIndex][level];
}
} // namespace GLState
} // namespace MG_State
} // namespace MobileGL
MobileGL/MG_State/GLState/TextureState/TextureStorage.h
+78 -14
View File
@@ -1,7 +1,7 @@
#pragma once #pragma once
#include <Includes.h>
#include <MG_Util/Math/VectorTypes.h>
#include "TextureEnum.h" #include "TextureEnum.h"
#include "MG_Util/Types.h"
#include "MG_Util/Math/VectorTypes.h"
namespace MobileGL { namespace MobileGL {
namespace MG_State { namespace MG_State {
@@ -14,22 +14,86 @@ namespace MobileGL {
template <SizeT TargetCount> template <SizeT TargetCount>
class TextureStorage { class TextureStorage {
public: public:
TextureStorage(); TextureStorage() {
static_assert(TargetCount > 0, "Mipmap size must be greater than zero");
}
void AllocateLevel(Uint targetIndex, Uint level, MipmapInput input); void AllocateLevel(Uint targetIndex, Uint level, MipmapInput input) {
void UpdateSubData(Uint targetIndex, Uint level, DataPtr input); MOBILEGL_ASSERT(targetIndex < TargetCount, "AllocateLevel: target invalid");
void* MapData(Uint targetIndex, Uint level);
IntVec3 GetTexelSize(Uint targetIndex, Uint level) const; auto& targetData = m_data[targetIndex];
SizeT GetByteSize(Uint targetIndex, Uint level) const; targetData.reserve(std::bit_ceil(level + 1));
SizeT GetLevelCount() const; targetData.resize(level + 1);
void MarkDirty(Uint targetIndex, Uint level, bool dirty); auto& targetTexelSizes = m_texelSizes[targetIndex];
bool IsDirty(Uint targetIndex, Uint level) const; targetTexelSizes.reserve(std::bit_ceil(level + 1));
targetTexelSizes.resize(level + 1);
targetTexelSizes[level] = input.texelSize;
auto& dirtyArr = m_isDirty[targetIndex];
dirtyArr.resize(level + 1, false);
auto& data = targetData[level];
data.resize(input.byteSize, 0);
}
void UpdateSubData(Uint targetIndex, Uint level, DataPtr input) {
MOBILEGL_ASSERT(targetIndex < TargetCount, "UpdateSubData: target invalid");
auto& targetData = m_data[targetIndex];
MOBILEGL_ASSERT(level < targetData.size(), "UpdateSubData: level out of range");
auto& levelData = targetData[level];
MOBILEGL_ASSERT(levelData.size() < input.size, "UpdateSubData: input data larger than allocated");
if (input.data && input.size > 0) {
const Uint8* src = static_cast<const Uint8*>(input.data);
Memcpy(levelData.data(), src, input.size);
m_isDirty[targetIndex][level] = true;
}
}
void* MapData(Uint targetIndex, Uint level) {
MOBILEGL_ASSERT(targetIndex < TargetCount, "UpdateSubData: target invalid");
auto& targetData = m_data[targetIndex];
MOBILEGL_ASSERT(level < targetData.size(), "UpdateSubData: level out of range");
auto& levelData = targetData[level];
return levelData.data();
}
IntVec3 GetTexelSize(Uint targetIndex, Uint level) const {
MOBILEGL_ASSERT(targetIndex < TargetCount, "GetTexelSize: target invalid");
auto& targetTexelSizes = m_texelSizes[targetIndex];
if (level >= targetTexelSizes.size())
return {0, 0, 0};
return targetTexelSizes[level];
}
SizeT GetByteSize(Uint targetIndex, Uint level) const {
MOBILEGL_ASSERT(targetIndex < TargetCount, "GetByteSize: target invalid");
auto& data = m_data[targetIndex];
return data[level].size();
}
SizeT GetLevelCount() const {
return m_data[0].size();
}
void MarkDirty(Uint targetIndex, Uint level, bool dirty) {
MOBILEGL_ASSERT(targetIndex < TargetCount, "MarkDirty: target invalid");
MOBILEGL_ASSERT(level < m_isDirty[targetIndex].size(), "MarkDirty: level out of range");
m_isDirty[targetIndex][level] = dirty;
}
bool IsDirty(Uint targetIndex, Uint level) const {
MOBILEGL_ASSERT(targetIndex < TargetCount, "IsDirty: target invalid");
MOBILEGL_ASSERT(level < m_isDirty[targetIndex].size(), "IsDirty: level out of range");
return m_isDirty[targetIndex][level];
}
protected: protected:
Array<Vector<IntVec3>, TargetCount> m_texelSizes; Array<Vector<IntVec3>, TargetCount> m_texelSizes;
Array<Vector<Vector<Uint8>>, TargetCount> m_data; Array<Vector<Vector<Uint8>>, TargetCount> m_data;
Array<Vector<bool>, TargetCount> m_isDirty; Array<Vector<bool>, TargetCount> m_isDirty;
}; };
} // namespace GLState }
} // namespace MG_State }
} // namespace MobileGL }