diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h index 06a0d9c9d..d62382288 100644 --- a/src/hardware/hw_defs.h +++ b/src/hardware/hw_defs.h @@ -173,7 +173,6 @@ enum SHADER_FLOOR = 0, SHADER_WALL, SHADER_SPRITE, - SHADER_SPRITECLIPHACK, SHADER_MODEL, SHADER_WATER, SHADER_FOG, diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index a8f6e0c51..33bb70ae4 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -3527,7 +3527,7 @@ static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts static inline void HWR_ApplyDispoffset(gl_vissprite_t *spr, FOutVector *wallVerts, const boolean papersprite) { // dont push papersprites near the cam unless they have a dispoffset - if (papersprite || HWR_UseShader()) + if (papersprite) { // if it has a dispoffset, push it a little towards the camera if (spr->dispoffset) @@ -3678,7 +3678,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) if (HWR_UseShader()) { - shader = (papersprite ? SHADER_SPRITE : SHADER_SPRITECLIPHACK); + shader = SHADER_SPRITE; blend |= PF_ColorMapped; } @@ -3949,7 +3949,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) if (HWR_UseShader()) { - shader = (papersprite ? SHADER_SPRITE : SHADER_SPRITECLIPHACK); + shader = SHADER_SPRITE; blend |= PF_ColorMapped; } diff --git a/src/hardware/hw_shaders.c b/src/hardware/hw_shaders.c index 184704dd0..9d5406858 100644 --- a/src/hardware/hw_shaders.c +++ b/src/hardware/hw_shaders.c @@ -35,9 +35,6 @@ static struct { // Sprite shader {GLSL_DEFAULT_VERTEX_SHADER, GLSL_WALL_FRAGMENT_SHADER}, - // Sprite clipping hack shader (for pulling things out of the floor) - {GLSL_SPRITECLIP_HACK_VERTEX_SHADER, GLSL_WALL_FRAGMENT_SHADER}, - // Model shader {GLSL_MODEL_LIGHTING_VERTEX_SHADER, GLSL_WALL_FRAGMENT_SHADER}, diff --git a/src/hardware/hw_shaders.h b/src/hardware/hw_shaders.h index cedc9d0bb..4fe046a61 100644 --- a/src/hardware/hw_shaders.h +++ b/src/hardware/hw_shaders.h @@ -31,16 +31,6 @@ "gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\n" \ "}\0" -// Sprite clipping makes me want to McFucking Die -#define GLSL_SPRITECLIP_HACK_VERTEX_SHADER \ - "void main(void) {\n" \ - "gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * gl_Vertex;\n" \ - "gl_FrontColor = gl_Color;\n" \ - "gl_TexCoord[0].xy = gl_MultiTexCoord0.xy;\n" \ - "gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\n" \ - "gl_Position.z -= 160.0 / gl_Position.z;\n" \ - "}\0" - // reinterpretation of sprite lighting for models // it's a combination of how it works for normal sprites & papersprites #define GLSL_MODEL_LIGHTING_VERTEX_SHADER \