OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved all variables not related to the hardware renderer's texture state out of gl_info.

Browse source
This commit is contained in:
Christoph Oelckers 2018-04-02 13:00:33 +02:00
commit d01bc452ba
12 changed files with 54 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,7 +130,7 @@ FHardwareTexture *FGLTexture::CreateHwTexture()
if (tex->UseType==ETextureType::Null) return NULL; // Cannot register a NULL texture
if (mHwTexture == NULL)
{
mHwTexture = new FHardwareTexture(tex->gl_info.bNoCompress);
mHwTexture = new FHardwareTexture(tex->bNoCompress);
}
return mHwTexture;
}
@ -314,21 +314,21 @@ FMaterial::FMaterial(FTexture * tx, bool expanded)
if (tx->bWarped)
{
mShaderIndex = tx->bWarped; // This picks SHADER_Warp1 or SHADER_Warp2
tx->gl_info.shaderspeed = static_cast<FWarpTexture*>(tx)->GetSpeed();
tx->shaderspeed = static_cast<FWarpTexture*>(tx)->GetSpeed();
}
else if (tx->bHasCanvas)
{
if (tx->gl_info.shaderindex >= FIRST_USER_SHADER)
if (tx->shaderindex >= FIRST_USER_SHADER)
{
mShaderIndex = tx->gl_info.shaderindex;
mShaderIndex = tx->shaderindex;
}
// no brightmap for cameratexture
}
else
{
if (tx->gl_info.shaderindex >= FIRST_USER_SHADER)
if (tx->shaderindex >= FIRST_USER_SHADER)
{
mShaderIndex = tx->gl_info.shaderindex;
mShaderIndex = tx->shaderindex;
}
else
{
@ -763,7 +763,7 @@ again:
{
if (expand)
{
if (tex->bWarped || tex->bHasCanvas || tex->gl_info.shaderindex >= FIRST_USER_SHADER)
if (tex->bWarped || tex->bHasCanvas || tex->shaderindex >= FIRST_USER_SHADER || (tex->shaderindex >= SHADER_Specular && tex->shaderindex <= SHADER_PBRBrightmap))
{
tex->gl_info.bNoExpand = true;
goto again;