mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-28 04:20:45 +00:00
- code cleanup.
This commit is contained in:
parent
6a9f1e9da1
commit
f2d075e0d0
5 changed files with 5 additions and 23 deletions
|
@ -1103,8 +1103,6 @@ enum {
|
|||
};
|
||||
|
||||
extern int32_t gltexmaxsize;
|
||||
void gltexapplyprops (void);
|
||||
void texcache_invalidate(void);
|
||||
|
||||
EXTERN_CVAR(Bool, hw_detailmapping)
|
||||
EXTERN_CVAR(Bool, hw_glowmapping)
|
||||
|
|
|
@ -420,18 +420,7 @@ void animvpx_setup_glstate(int32_t animvpx_flags)
|
|||
////////// GL STATE //////////
|
||||
vpxtex[0] = MakeGameTexture(new VPXTexture, nullptr, ETextureType::Special);
|
||||
vpxtex[1] = MakeGameTexture(new VPXTexture, nullptr, ETextureType::Special);
|
||||
|
||||
if ((animvpx_flags & CUTSCENE_TEXTUREFILTER && gl_texture_filter == TEXFILTER_ON) || animvpx_flags & CUTSCENE_FORCEFILTER ||
|
||||
(!(animvpx_flags & CUTSCENE_TEXTUREFILTER) && !(animvpx_flags & CUTSCENE_FORCENOFILTER))) // if no flags, then use filter for IVFs
|
||||
{
|
||||
sampler = CLAMP_XY;
|
||||
}
|
||||
else
|
||||
{
|
||||
sampler = CLAMP_XY;
|
||||
}
|
||||
|
||||
|
||||
sampler = CLAMP_XY;
|
||||
GLInterface.ClearScreen(0, true);
|
||||
}
|
||||
|
||||
|
|
|
@ -120,11 +120,6 @@ float sectorVisibility(int sectnum)
|
|||
return v? ((uint8_t)(v + 16)) / 16.f : 1.f;
|
||||
}
|
||||
|
||||
void gltexapplyprops(void)
|
||||
{
|
||||
screen->SetTextureFilterMode();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
//Use this for both initialization and uninitialization of OpenGL.
|
||||
|
|
|
@ -31,8 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "build.h"
|
||||
#include "animtexture.h"
|
||||
#include "v_2ddrawer.h"
|
||||
#include "../glbackend/glbackend.h"
|
||||
|
||||
#include "v_video.h"
|
||||
|
||||
#include "anim.h"
|
||||
|
||||
|
@ -523,7 +522,7 @@ int32_t Anim_Play(const char *fn)
|
|||
|
||||
end_anim_restore_gl:
|
||||
gl_texture_filter = ogltexfiltermode;
|
||||
gltexapplyprops();
|
||||
screen->SetTextureFilterMode();
|
||||
end_anim:
|
||||
inputState.ClearAllInput();
|
||||
anim->animbuf = nullptr;
|
||||
|
|
|
@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "cmdlib.h"
|
||||
#include "v_2ddrawer.h"
|
||||
#include "animtexture.h"
|
||||
#include "v_video.h"
|
||||
#include "../glbackend/glbackend.h"
|
||||
|
||||
|
||||
|
@ -562,7 +563,7 @@ int32_t Anim_Play(const char *fn)
|
|||
|
||||
end_anim_restore_gl:
|
||||
gl_texture_filter = ogltexfiltermode;
|
||||
gltexapplyprops();
|
||||
screen->SetTextureFilterMode();
|
||||
end_anim:
|
||||
inputState.ClearAllInput();
|
||||
anim->animbuf = nullptr;
|
||||
|
|
Loading…
Reference in a new issue