From 0962288d036832b4efc92076c1c577c452f4b56d Mon Sep 17 00:00:00 2001 From: Artem Kharytoniuk Date: Mon, 3 Apr 2017 16:00:00 +0300 Subject: [PATCH] Cleanup: removed unused GL_DECAL texture env mode. --- src/engine/renderer/tr_backend.c | 3 --- src/engine/renderer/tr_shader.c | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/engine/renderer/tr_backend.c b/src/engine/renderer/tr_backend.c index 80c3a1f..43726c1 100644 --- a/src/engine/renderer/tr_backend.c +++ b/src/engine/renderer/tr_backend.c @@ -158,9 +158,6 @@ void GL_TexEnv( int env ) case GL_REPLACE: qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE ); break; - case GL_DECAL: - qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL ); - break; case GL_ADD: qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_ADD ); break; diff --git a/src/engine/renderer/tr_shader.c b/src/engine/renderer/tr_shader.c index 9af9567..7734f39 100644 --- a/src/engine/renderer/tr_shader.c +++ b/src/engine/renderer/tr_shader.c @@ -1728,10 +1728,7 @@ static collapse_t collapse[] = { { GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE, GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE, GL_ADD, GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE }, -#if 0 - { 0, GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA, - GL_DECAL, 0 }, -#endif + { -1 } }; @@ -2772,8 +2769,6 @@ void R_ShaderList_f (void) { ri.Printf( PRINT_ALL, "MT(a) " ); } else if ( shader->multitextureEnv == GL_MODULATE ) { ri.Printf( PRINT_ALL, "MT(m) " ); - } else if ( shader->multitextureEnv == GL_DECAL ) { - ri.Printf( PRINT_ALL, "MT(d) " ); } else { ri.Printf( PRINT_ALL, " " ); }