Skip to content

Commit ef3d7c7

Browse files
authored
Merge pull request #1024 from hemostx/centroid
RENDERER: enable centroid sampling for world geometry
2 parents f3096a0 + e75386f commit ef3d7c7

6 files changed

+10
-10
lines changed

src/glsl/draw_world.fragment.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ layout(std140, binding=EZQ_GL_BINDINGPOINT_BRUSHMODEL_SAMPLERS) buffer SamplerMa
2727
};
2828

2929
in vec3 TextureCoord;
30-
in vec3 TexCoordLightmap;
30+
centroid in vec3 TexCoordLightmap;
3131
#ifdef DRAW_DETAIL_TEXTURES
3232
in vec2 DetailCoord;
3333
#endif

src/glsl/draw_world.vertex.glsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ layout(location = 5) in int vboFlags;
1111
layout(location = 6) in vec3 flatColor;
1212
layout(location = 7) in int surfaceNumber;
1313

14-
out vec3 TexCoordLightmap;
14+
centroid out vec3 TexCoordLightmap;
1515
out vec3 TextureCoord;
1616
#ifdef DRAW_TEXTURELESS
1717
out vec3 TextureLessCoord;

src/glsl/glc/glc_world_drawflat.fragment.glsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
#ifdef EZ_USE_TEXTURE_ARRAYS
66
#extension GL_EXT_texture_array : enable
77
uniform sampler2DArray texSampler;
8-
varying vec3 TextureCoord;
8+
centroid varying vec3 TextureCoord;
99
#else
1010
uniform sampler2D texSampler;
11-
varying vec2 TextureCoord;
11+
centroid varying vec2 TextureCoord;
1212
#endif
1313

1414
varying float lightmapScale;

src/glsl/glc/glc_world_drawflat.vertex.glsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
attribute float style;
66
varying vec4 color;
77
#ifdef EZ_USE_TEXTURE_ARRAYS
8-
varying vec3 TextureCoord;
8+
centroid varying vec3 TextureCoord;
99
#else
10-
varying vec2 TextureCoord;
10+
centroid varying vec2 TextureCoord;
1111
#endif
1212
varying float lightmapScale;
1313
varying float fogScale;

src/glsl/glc/glc_world_textured.fragment.glsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ varying vec2 TextureCoord;
6464
#ifdef DRAW_LIGHTMAPS
6565
#ifdef EZ_USE_TEXTURE_ARRAYS
6666
uniform sampler2DArray lightmapSampler;
67-
varying vec3 LightmapCoord;
67+
centroid varying vec3 LightmapCoord;
6868
#else
6969
uniform sampler2D lightmapSampler;
70-
varying vec2 LightmapCoord;
70+
centroid varying vec2 LightmapCoord;
7171
#endif
7272
#endif
7373

src/glsl/glc/glc_world_textured.vertex.glsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ attribute float style;
77

88
#ifdef DRAW_LIGHTMAPS
99
#ifdef EZ_USE_TEXTURE_ARRAYS
10-
varying vec3 LightmapCoord;
10+
centroid varying vec3 LightmapCoord;
1111
#else
12-
varying vec2 LightmapCoord;
12+
centroid varying vec2 LightmapCoord;
1313
#endif
1414
#endif
1515
#ifdef DRAW_EXTRA_TEXTURES

0 commit comments

Comments
 (0)