zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-24 05:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- texture code restructuring.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-30 20:55:29 +02:00
parent cdcb25bc1f
commit 423f758314
14 changed files with 80 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

19
source/glbackend/glbackend.cpp
View file

@ -286,6 +286,8 @@ void GLInstance::DrawImGui(ImDrawData* data)
void PolymostRenderState::Apply(PolymostShader* shader, GLState &oldState)
{
if (!OpenGLRenderer::GLRenderer) return;
auto sm = OpenGLRenderer::GLRenderer->mSamplerManager;
bool reset = false;
for (int i = 0; i < MAX_TEXTURES; i++)
{
@ -297,13 +299,24 @@ void PolymostRenderState::Apply(PolymostShader* shader, GLState &oldState)
reset = true;
}
glBindTexture(GL_TEXTURE_2D, texIds[i]);
if (OpenGLRenderer::GLRenderer)
OpenGLRenderer::GLRenderer->mSamplerManager->Bind(i, samplerIds[i], -1);
sm->Bind(i, samplerIds[i], -1);
oldState.TexId[i] = texIds[i];
oldState.SamplerId[i] = samplerIds[i];
}
if (reset) glActiveTexture(GL_TEXTURE0);
}
if (PaletteTexture != nullptr)
{
PaletteTexture->Bind(4, false);
sm->Bind(4, CLAMP_NOFILTER, -1);
}
if (LookupTexture != nullptr)
{
LookupTexture->Bind(5, false);
sm->Bind(5, CLAMP_NOFILTER, -1);
}
glActiveTexture(GL_TEXTURE0);
if (StateFlags != oldState.Flags)
{
if ((StateFlags ^ oldState.Flags) & STF_DEPTHTEST)