Skip to content

Improve screen-space shaders, some minor clean-up #1593

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Mar 17, 2025
Merged

Improve screen-space shaders, some minor clean-up #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c699738
NUKE some dead code
VReaperV Mar 11, 2025
a958075
Use a simple screenSpace vertex shader
VReaperV Mar 11, 2025
e1b9816
Change cameraEffects shader to use screenSpace vertex shader
VReaperV Mar 11, 2025
82b8a05
NUKE unused attr_TexCoord0/vTexCoord from lighttile
VReaperV Mar 11, 2025
5705e1b
Some fixes, clean-up, and re-ordering of shaders
VReaperV Mar 11, 2025
a7676d4
Remove some unused and needlessly verbose stuff from GLHeader
VReaperV Mar 12, 2025
d944db9
Remove some more noise from GLShader constructors
VReaperV Mar 12, 2025
a67058e
Fix bloom crashing
VReaperV Mar 16, 2025
eaf4657
NUKE unused ATTR_TEXCOORD from cameraEffects
VReaperV Mar 17, 2025
6462392
Fix cameraEffects compile error
VReaperV Mar 17, 2025
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
80 changes: 42 additions & 38 deletions src.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,67 +139,71 @@ set(RENDERERLIST
)

set(GLSLSOURCELIST
# Common shader libraries
${ENGINE_DIR}/renderer/glsl_source/common.glsl
${ENGINE_DIR}/renderer/glsl_source/common_cp.glsl
${ENGINE_DIR}/renderer/glsl_source/shaderProfiler_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/shaderProfiler_fp.glsl

# Material system shaders
${ENGINE_DIR}/renderer/glsl_source/material_cp.glsl
${ENGINE_DIR}/renderer/glsl_source/material_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/material_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/clearSurfaces_cp.glsl
${ENGINE_DIR}/renderer/glsl_source/cull_cp.glsl
${ENGINE_DIR}/renderer/glsl_source/depthReduction_cp.glsl
${ENGINE_DIR}/renderer/glsl_source/processSurfaces_cp.glsl
${ENGINE_DIR}/renderer/glsl_source/material_cp.glsl
${ENGINE_DIR}/renderer/glsl_source/material_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/material_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/skybox_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/ssao_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/ssao_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/vertexAnimation_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/vertexSimple_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/vertexSkinning_vp.glsl

# Screen-space shaders
${ENGINE_DIR}/renderer/glsl_source/screenSpace_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/blur_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/blur_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/cameraEffects_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/cameraEffects_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/computeLight_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/contrast_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/contrast_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/debugShadowMap_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/debugShadowMap_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/deformVertexes_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/depthtile1_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/fogGlobal_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/fxaa_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/fxaa3_11_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/motionblur_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/ssao_fp.glsl

# Lighting shaders
${ENGINE_DIR}/renderer/glsl_source/depthtile1_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/depthtile1_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/depthtile2_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/depthtile2_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/fogGlobal_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/fogGlobal_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/fogQuake3_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/lighttile_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/lighttile_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/computeLight_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/reliefMapping_fp.glsl

# Common vertex shader libraries
${ENGINE_DIR}/renderer/glsl_source/deformVertexes_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/vertexAnimation_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/vertexSimple_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/vertexSkinning_vp.glsl

# Regular shaders
${ENGINE_DIR}/renderer/glsl_source/debugShadowMap_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/debugShadowMap_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/fogQuake3_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/forwardLighting_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/fogQuake3_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/forwardLighting_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/fxaa_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/fxaa_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/fxaa3_11_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/generic_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/forwardLighting_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/generic_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/heatHaze_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/generic_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/heatHaze_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/lightMapping_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/heatHaze_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/lightMapping_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/lighttile_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/lighttile_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/liquid_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/lightMapping_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/liquid_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/motionblur_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/motionblur_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/portal_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/liquid_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/portal_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/reflection_CB_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/portal_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/reflection_CB_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/reliefMapping_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/screen_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/reflection_CB_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/screen_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/shadowFill_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/screen_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/shadowFill_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/shadowFill_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/skybox_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/skybox_fp.glsl
)

Expand Down
Loading