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.

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

Jump to bottom

Shader system improvements (redo) #2715

Closed
wants to merge 9 commits into from
Closed

Shader system improvements (redo) #2715

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9edc4bb
Shader system improvements and fixes.
EliteMasterEric Jul 29, 2022
80fd468
Made glVersion a String, changed version for Android.
EliteMasterEric Dec 1, 2022
cf4eda0
Compatibility fixes and glExtensions
EliteMasterEric Dec 2, 2022
ff9406f
Fixes for Linux, separated frag and vert extensions
EliteMasterEric Dec 2, 2022
13f2ff9
Further Linux fixes
EliteMasterEric Dec 4, 2022
4bf36de
Added default version for MacOS
EliteMasterEric Dec 4, 2022
e925d2d
Additional fixes and reability refactor
EliteMasterEric May 1, 2023
3a867ff
Major syntax cleanup (thanks GeoKureli)
EliteMasterEric Jun 14, 2024
fd2f6c9
Fix an issue where the GraphicsShader glVersion was hardcoded instead…
EliteMasterEric Jun 26, 2024
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
7 changes: 4 additions & 3 deletions src/openfl/display/GraphicsShader.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import openfl.utils.ByteArray;
#end
class GraphicsShader extends Shader
{
@:glVersion("120")
@:glVertexHeader("attribute float openfl_Alpha;
attribute vec4 openfl_ColorMultiplier;
attribute vec4 openfl_ColorOffset;
Expand All @@ -21,7 +22,7 @@ class GraphicsShader extends Shader

uniform mat4 openfl_Matrix;
uniform bool openfl_HasColorTransform;
uniform vec2 openfl_TextureSize;")
uniform vec2 openfl_TextureSize;", true)
@:glVertexBody("openfl_Alphav = openfl_Alpha;
openfl_TextureCoordv = openfl_TextureCoord;

Expand All @@ -47,7 +48,7 @@ class GraphicsShader extends Shader

uniform bool openfl_HasColorTransform;
uniform vec2 openfl_TextureSize;
uniform sampler2D bitmap;")
uniform sampler2D bitmap;", true)
@:glFragmentBody("vec4 color = texture2D (bitmap, openfl_TextureCoordv);

if (color.a == 0.0) {
Expand Down Expand Up @@ -80,7 +81,7 @@ class GraphicsShader extends Shader

gl_FragColor = color * openfl_Alphav;

}")
}", true)
#if emscripten
@:glFragmentSource("#pragma header

Expand Down
Loading
Loading