OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- route texture binding through the renderstate class for better control. Currently it's just a direct passthrough but this will change.

Browse source
This commit is contained in:
Christoph Oelckers 2014-09-09 12:00:42 +02:00
commit 4bb320a27c
16 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/gl/textures/gl_material.cpp
View file

@ -616,11 +616,9 @@ static int lastclamp;
static int lasttrans;
static bool lastalpha;
void FMaterial::Bind(int clampmode, int translation, int overrideshader, bool alphatexture)
{
int shaderindex = overrideshader >= 0? overrideshader : mShaderIndex;
gl_RenderState.SetShader(shaderindex, tex->gl_info.shaderspeed);
void FMaterial::Bind(int clampmode, int translation, bool alphatexture)
{
// avoid rebinding the same texture multiple times.
if (this == last && lastclamp == clampmode && translation == lasttrans && lastalpha == alphatexture) return;
last = this;
@ -636,7 +634,7 @@ void FMaterial::Bind(int clampmode, int translation, int overrideshader, bool al
else if (tex->bWarped && clampmode <= CLAMP_XY) clampmode = CLAMP_NONE;
const FHardwareTexture *gltexture = mBaseLayer->Bind(0, clampmode, translation, alphatexture, allowhires? tex:NULL);
if (gltexture != NULL && shaderindex > 0 && overrideshader == -1)
if (gltexture != NULL)
{
for(unsigned i=0;i<mTextureLayers.Size();i++)
{
@ -671,7 +669,7 @@ void FMaterial::Bind(int clampmode, int translation, int overrideshader, bool al
//===========================================================================
void FMaterial::Precache()
{
Bind(0, 0, 0, false);
Bind(0, 0, false);
}
//===========================================================================