edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

only allow changing to use single/multiple texture units at restart

Browse source
This commit is contained in:
Jupeyy 2017-09-14 02:58:13 +02:00
parent 1167ab822c
commit 211f8a6b11
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/engine/client/backend_sdl.cpp
View file

@ -513,7 +513,7 @@ void CCommandProcessorFragment_OpenGL3_3::SetState(const CCommandBuffer::SState
{
int Slot = State.m_Texture % m_MaxTextureUnits;
if(g_Config.m_GfxEnableTextureUnitOptimization)
if(m_UseMultipleTextureUnits)
{
if(!IsAndUpdateTextureSlotBound(Slot, State.m_Texture))
{
@ -581,7 +581,8 @@ void CCommandProcessorFragment_OpenGL3_3::SetState(const CCommandBuffer::SState
void CCommandProcessorFragment_OpenGL3_3::Cmd_Init(const SCommand_Init *pCommand)
{
if(!g_Config.m_GfxEnableTextureUnitOptimization)
m_UseMultipleTextureUnits = g_Config.m_GfxEnableTextureUnitOptimization;
if(!m_UseMultipleTextureUnits)
{
glActiveTexture(GL_TEXTURE0);
}
@ -842,7 +843,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Shutdown(const SCommand_Shutdown *
void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Update(const CCommandBuffer::SCommand_Texture_Update *pCommand)
{
if(g_Config.m_GfxEnableTextureUnitOptimization)
if(m_UseMultipleTextureUnits)
{
int Slot = pCommand->m_Slot % m_MaxTextureUnits;
//just tell, that we using this texture now
@ -858,7 +859,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Update(const CCommandBuffe
void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Destroy(const CCommandBuffer::SCommand_Texture_Destroy *pCommand)
{
int Slot = 0;
if(g_Config.m_GfxEnableTextureUnitOptimization)
if(m_UseMultipleTextureUnits)
{
Slot = pCommand->m_Slot % m_MaxTextureUnits;
IsAndUpdateTextureSlotBound(Slot, pCommand->m_Slot);
@ -925,7 +926,7 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_Texture_Create(const CCommandBuffe
}
#endif
int Slot = 0;
if(g_Config.m_GfxEnableTextureUnitOptimization)
if(m_UseMultipleTextureUnits)
{
Slot = pCommand->m_Slot % m_MaxTextureUnits;
//just tell, that we using this texture now

2
src/engine/client/backend_sdl.h
View file

@ -128,6 +128,8 @@ class CGLSLBorderTileLineProgram;
// takes care of opengl 3.2 related rendering
class CCommandProcessorFragment_OpenGL3_3
{
bool m_UseMultipleTextureUnits;
struct CTexture
{
GLuint m_Tex;