Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RENDERER: enable centroid sampling for world geometry #1024

Merged
merged 1 commit into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/glsl/draw_world.fragment.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ layout(std140, binding=EZQ_GL_BINDINGPOINT_BRUSHMODEL_SAMPLERS) buffer SamplerMa
};

in vec3 TextureCoord;
in vec3 TexCoordLightmap;
centroid in vec3 TexCoordLightmap;
#ifdef DRAW_DETAIL_TEXTURES
in vec2 DetailCoord;
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/glsl/draw_world.vertex.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ layout(location = 5) in int vboFlags;
layout(location = 6) in vec3 flatColor;
layout(location = 7) in int surfaceNumber;

out vec3 TexCoordLightmap;
centroid out vec3 TexCoordLightmap;
out vec3 TextureCoord;
#ifdef DRAW_TEXTURELESS
out vec3 TextureLessCoord;
Expand Down
4 changes: 2 additions & 2 deletions src/glsl/glc/glc_world_drawflat.fragment.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#ifdef EZ_USE_TEXTURE_ARRAYS
#extension GL_EXT_texture_array : enable
uniform sampler2DArray texSampler;
varying vec3 TextureCoord;
centroid varying vec3 TextureCoord;
#else
uniform sampler2D texSampler;
varying vec2 TextureCoord;
centroid varying vec2 TextureCoord;
#endif

varying float lightmapScale;
Expand Down
4 changes: 2 additions & 2 deletions src/glsl/glc/glc_world_drawflat.vertex.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
attribute float style;
varying vec4 color;
#ifdef EZ_USE_TEXTURE_ARRAYS
varying vec3 TextureCoord;
centroid varying vec3 TextureCoord;
#else
varying vec2 TextureCoord;
centroid varying vec2 TextureCoord;
#endif
varying float lightmapScale;
varying float fogScale;
Expand Down
4 changes: 2 additions & 2 deletions src/glsl/glc/glc_world_textured.fragment.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ varying vec2 TextureCoord;
#ifdef DRAW_LIGHTMAPS
#ifdef EZ_USE_TEXTURE_ARRAYS
uniform sampler2DArray lightmapSampler;
varying vec3 LightmapCoord;
centroid varying vec3 LightmapCoord;
#else
uniform sampler2D lightmapSampler;
varying vec2 LightmapCoord;
centroid varying vec2 LightmapCoord;
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions src/glsl/glc/glc_world_textured.vertex.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ attribute float style;

#ifdef DRAW_LIGHTMAPS
#ifdef EZ_USE_TEXTURE_ARRAYS
varying vec3 LightmapCoord;
centroid varying vec3 LightmapCoord;
#else
varying vec2 LightmapCoord;
centroid varying vec2 LightmapCoord;
#endif
#endif
#ifdef DRAW_EXTRA_TEXTURES
Expand Down
Loading