swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-09 04:38:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (MG_State/TextureState): Fix incorrect behavior.

Browse Source
This commit is contained in:
BZLZHH
2025-08-12 18:11:36 +08:00
parent a78c53ecdd
commit 4eba014513
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_State/GLState/Core.cpp
+2 -2
View File
@@ -136,8 +136,8 @@ namespace MobileGL {
m_textureState.MarkTextureObjectForDeletion(index);
}
TextureUnit& GLContext::GetTextureUnitObject() {
return m_textureState.GetUnitObject();
TextureUnit& GLContext::GetTextureUnitObject(Int unit) {
return m_textureState.GetUnitObject(unit);
}
Bool GLContext::ValidateTextureName(Uint index) const {
MobileGL/MG_State/GLState/Core.h
+2 -1
View File
@@ -48,7 +48,7 @@ namespace MobileGL {
SharedPtr<ITextureObject> GetTextureObject(Uint index);
SharedPtr<ITextureObject> CreateTextureObject(Uint index, TextureTarget target);
void MarkTextureObjectForDeletion(Uint index);
TextureUnit& GetTextureUnitObject();
TextureUnit& GetTextureUnitObject(Int unit);
Bool ValidateTextureName(Uint index) const;
Bool ValidateTextureObject(Uint index) const;
Int GetActiveTextureUnit() const;
@@ -64,6 +64,7 @@ namespace MobileGL {
SharedPtr<ProgramObject> GetProgramObject(Uint index);
SharedPtr<ShaderObject> GetShaderObject(Uint index);
void UseProgram(Uint program);
private:
// Error
ErrorState m_errorState;
MobileGL/MG_State/GLState/TextureState/TextureObject.h
+1 -1
View File
@@ -21,7 +21,7 @@ namespace MobileGL {
Red,
RG,
RGB,
BFR,
BGR,
RGBA,
BGRA,
RInteger,
MobileGL/MG_State/GLState/TextureState/TextureState.cpp
+3 -3
View File
@@ -64,11 +64,11 @@ namespace MobileGL {
}
}
TextureUnit& TextureState::GetUnitObject() {
if (m_activeTextureUnit < 0 || m_activeTextureUnit >= MAX_TEXTURE_IMAGE_UNITS) {
TextureUnit& TextureState::GetUnitObject(Int unit) {
if (unit < 0 || unit >= MAX_TEXTURE_IMAGE_UNITS) {
THROW_EXCEPTION("Active texture unit is out of range");
}
return m_textureUnits[m_activeTextureUnit];
return m_textureUnits[unit];
}
Int TextureState::GetActiveTextureUnit() const {
MobileGL/MG_State/GLState/TextureState/TextureState.h
+1 -1
View File
@@ -16,7 +16,7 @@ namespace MobileGL {
Vector<Uint> GenerateNames(Uint number);
SharedPtr<ITextureObject> CreateTextureObject(Uint index, TextureTarget target);
SharedPtr<ITextureObject> GetTextureObject(Uint index);
TextureUnit& GetUnitObject();
TextureUnit& GetUnitObject(Int unit);
Int GetActiveTextureUnit() const;
void SetActiveTextureUnit(Int unit);
void MarkTextureObjectForDeletion(Uint index);
MobileGL/MG_State/GLState/TextureState/TextureUnit.cpp
+4
View File
@@ -18,6 +18,10 @@ namespace MobileGL {
GetAllBindingSlots() {
return m_slots;
}
void TextureUnit::SetSamplerObject(SharedPtr<SamplerObject> sampler) {
m_sampler = sampler;
}
} // namespace GLState
} // namespace MG_State
} // namespace MobileGL
MobileGL/MG_State/GLState/TextureState/TextureUnit.h
+1
View File
@@ -13,6 +13,7 @@ namespace MobileGL {
BindingSlot<ITextureObject>& GetBindingSlot(TextureTarget target);
SharedPtr<SamplerObject> GetSamplerObject() const;
Array<BindingSlot<ITextureObject>, (int)TextureTarget::TextureTargetCount>& GetAllBindingSlots();
void SetSamplerObject(SharedPtr<SamplerObject> sampler);
private:
Array<BindingSlot<ITextureObject>, (int)TextureTarget::TextureTargetCount> m_slots;