Remove duplicate shaders for core profile, instead use preprocessor
1d3b45669dca
Actions

Authored by ahiemstra on May 20 2020, 12:34 PM.

Description

Remove duplicate shaders for core profile, instead use preprocessor

This removes the need to have separate _core profile shaders, instead
handling the small differences between core and legacy with some
preprocessor tricks. This matches the behaviour with Kirigami where
I did the same.

In addition, this brings in another change from Kirigami where the
sdf_render functions have been split up and no longer blend based
on the target color's alpha.

Details

Committed

ahiemstra

May 20 2020, 12:44 PM

Parents

R1049:fa334cf9e809: Add MapProxySource

Branches

Unknown

Tags

Unknown

ahiemstra committed R1049:1d3b45669dca: Remove duplicate shaders for core profile, instead use preprocessor (authored by ahiemstra).May 20 2020, 12:44 PM

Changes (16)

				Path	Packages
	M			src/scenegraph/SDFShader.cpp
	V			src/shaders/{desktop_header.glsl → header_desktop.glsl}
	V			src/shaders/{desktop_header_core.glsl → header_desktop_core.glsl}
	V			src/shaders/{es_header.glsl → header_es2.glsl}
	V			src/shaders/{header_desktop.glsl ← desktop_header.glsl}
	V			src/shaders/{header_desktop_core.glsl ← desktop_header_core.glsl}
	V			src/shaders/{header_es2.glsl ← es_header.glsl}
	D			src/shaders/linechart_core.frag
	D			src/shaders/linechart_core.vert
	D			src/shaders/piechart_core.frag
	D			src/shaders/piechart_core.vert
	V			src/shaders/{sdf.frag → sdf.glsl}
	V			src/shaders/{sdf.glsl ← sdf.frag}
	D			src/shaders/sdf_core.frag
	M			src/shaders/shaders.qrc
	D			src/shaders/uv.vert

Remove duplicate shaders for core profile, instead use preprocessor1d3b45669dcaActions

Description

Details

Changes (16)

R1049:1d3b45669dca

src/scenegraph/SDFShader.cpp

src/shaders/desktop_header.glsl

src/shaders/desktop_header_core.glsl

src/shaders/es_header.glsl

src/shaders/header_desktop.glsl

src/shaders/header_desktop_core.glsl

src/shaders/header_es2.glsl

src/shaders/linechart_core.frag

src/shaders/linechart_core.vert

src/shaders/piechart_core.frag

src/shaders/piechart_core.vert

src/shaders/sdf.frag

src/shaders/sdf.glsl

src/shaders/sdf_core.frag

src/shaders/shaders.qrc

src/shaders/uv.vert

Remove duplicate shaders for core profile, instead use preprocessor
1d3b45669dca
Actions