git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-11 15:12:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

gl_engine: use modern glsl syntax in shader source

Browse source 
Upgrade the used glsl version in GL shader source.

  New version can directly specify the attribute location in
  shader and the uniform block is only available in new glsl version
This commit is contained in:
RuiwenTang 2023-08-11 12:25:32 +08:00 • committed by Hermet Park
parent 80ce345660
commit acd51a3aa0
4 changed files with 53 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lib/gl_engine/tvgGlRenderTask.cpp
View file

@ -36,7 +36,8 @@ GlRenderTask::GlRenderTask(RenderTypes renderType, shared_ptr<GlShader> shader)
load(); load();
VertexProperty* prop = nullptr; VertexProperty* prop = nullptr;
ADD_ATTRIBUTE_PROPERTY(prop, this, mProgram, "aLocation", FORMAT_SIZE_VEC_4, mLocVertexAttribute); // now location is specified directly in shader
mLocVertexAttribute = 0;
ADD_UNIFORM_PROPERTY_2(prop, this, mProgram, "uTransform", FORMAT_SIZE_MAT_4x4, mLocTransform, VertexProperty::DataType::MATRIX); ADD_UNIFORM_PROPERTY_2(prop, this, mProgram, "uTransform", FORMAT_SIZE_MAT_4x4, mLocTransform, VertexProperty::DataType::MATRIX);
} }

1
src/lib/gl_engine/tvgGlRenderTask.h
View file

@ -55,7 +55,6 @@ public:
private: private:
RenderTypes mRenderType; RenderTypes mRenderType;
uint32_t propertyFormatSize;
std::shared_ptr<GlProgram> mProgram; std::shared_ptr<GlProgram> mProgram;
std::map<int32_t, VertexProperty> mAttributePropertyBuffer; std::map<int32_t, VertexProperty> mAttributePropertyBuffer;
std::map<int32_t, VertexProperty> mUniformPropertyBuffer; std::map<int32_t, VertexProperty> mUniformPropertyBuffer;

14
src/lib/gl_engine/tvgGlShader.cpp
View file

@ -67,8 +67,20 @@ uint32_t GlShader::complileShader(uint32_t type, char* shaderSrc)
// Create the shader object // Create the shader object
shader = glCreateShader(type); shader = glCreateShader(type);
/**
* [0] shader version string
* [1] precision declaration
* [2] shader source
*/
const char* shaderPack[3];
// for now only support GLES version
// but in general All Desktop GPU should use OpenGL version ( #version 330 core )
shaderPack[0] ="#version 300 es\n";
shaderPack[1] = "precision highp float;\n precision mediump int;\n";
shaderPack[2] = shaderSrc;
// Load the shader source // Load the shader source
glShaderSource(shader, 1, &shaderSrc, NULL); glShaderSource(shader, 3, shaderPack, NULL);
// Compile the shader // Compile the shader
glCompileShader(shader); glCompileShader(shader);

74
src/lib/gl_engine/tvgGlShaderSrc.cpp
View file

@ -26,9 +26,9 @@
#define TVG_COMPOSE_SHADER(shader) #shader #define TVG_COMPOSE_SHADER(shader) #shader
const char* COLOR_VERT_SHADER = TVG_COMPOSE_SHADER( const char* COLOR_VERT_SHADER = TVG_COMPOSE_SHADER(
attribute mediump vec4 aLocation; \n layout(location = 0) in vec3 aLocation; \n
uniform highp mat4 uTransform; \n uniform mat4 uTransform; \n
varying highp float vOpacity; \n out float vOpacity; \n
void main() \n void main() \n
{ \n { \n
gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0); \n gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0); \n
@ -36,18 +36,19 @@ const char* COLOR_VERT_SHADER = TVG_COMPOSE_SHADER(
}); });
const char* COLOR_FRAG_SHADER = TVG_COMPOSE_SHADER( const char* COLOR_FRAG_SHADER = TVG_COMPOSE_SHADER(
uniform highp vec4 uColor; \n uniform vec4 uColor; \n
varying highp float vOpacity; \n in float vOpacity; \n
out vec4 FragColor; \n
void main() \n void main() \n
{ \n { \n
gl_FragColor = vec4(uColor.xyz, uColor.w*vOpacity); \n FragColor = vec4(uColor.xyz, uColor.w*vOpacity); \n
}); });
const char* GRADIENT_VERT_SHADER = TVG_COMPOSE_SHADER( const char* GRADIENT_VERT_SHADER = TVG_COMPOSE_SHADER(
attribute highp vec4 aLocation; \n layout(location = 0) in vec3 aLocation; \n
varying highp float vOpacity; \n out float vOpacity; \n
varying highp vec2 vPos; \n out vec2 vPos; \n
uniform highp mat4 uTransform; \n uniform mat4 uTransform; \n
\n \n
void main() \n void main() \n
{ \n { \n
@ -57,17 +58,16 @@ void main()
}); });
std::string STR_GRADIENT_FRAG_COMMON_VARIABLES = TVG_COMPOSE_SHADER( std::string STR_GRADIENT_FRAG_COMMON_VARIABLES = TVG_COMPOSE_SHADER( \n
precision highp float; \n
const int MAX_STOP_COUNT = 4; \n const int MAX_STOP_COUNT = 4; \n
uniform highp vec2 uSize; \n uniform vec2 uSize; \n
uniform highp vec2 uCanvasSize; \n uniform vec2 uCanvasSize; \n
uniform float nStops; \n uniform float nStops; \n
uniform float noise_level; \n uniform float noise_level; \n
uniform float stopPoints[MAX_STOP_COUNT]; \n uniform float stopPoints[MAX_STOP_COUNT]; \n
uniform vec4 stopColors[MAX_STOP_COUNT]; \n uniform vec4 stopColors[MAX_STOP_COUNT]; \n
varying highp vec2 vPos; \n in vec2 vPos; \n
varying highp float vOpacity; \n in float vOpacity; \n
); );
std::string STR_GRADIENT_FRAG_COMMON_FUNCTIONS = TVG_COMPOSE_SHADER( std::string STR_GRADIENT_FRAG_COMMON_FUNCTIONS = TVG_COMPOSE_SHADER(
@ -107,53 +107,55 @@ vec4 gradient(float t)
return col; \n return col; \n
} \n } \n
\n \n
highp vec3 ScreenSpaceDither(vec2 vScreenPos) \n vec3 ScreenSpaceDither(vec2 vScreenPos) \n
{ \n { \n
highp vec3 vDither = vec3(dot(vec2(171.0, 231.0), vScreenPos.xy)); \n vec3 vDither = vec3(dot(vec2(171.0, 231.0), vScreenPos.xy)); \n
vDither.rgb = fract(vDither.rgb / vec3(103.0, 71.0, 97.0)); \n vDither.rgb = fract(vDither.rgb / vec3(103.0, 71.0, 97.0)); \n
return vDither.rgb / 255.0; \n return vDither.rgb / 255.0; \n
}); });
std::string STR_LINEAR_GRADIENT_VARIABLES = TVG_COMPOSE_SHADER( std::string STR_LINEAR_GRADIENT_VARIABLES = TVG_COMPOSE_SHADER(
uniform highp vec2 gradStartPos; \n uniform vec2 gradStartPos; \n
uniform highp vec2 gradEndPos; \n uniform vec2 gradEndPos; \n
); );
std::string STR_LINEAR_GRADIENT_MAIN = TVG_COMPOSE_SHADER( std::string STR_LINEAR_GRADIENT_MAIN = TVG_COMPOSE_SHADER(
out vec4 FragColor; \n
void main() \n void main() \n
{ \n { \n
highp vec2 pos = vec2(vPos.x * uCanvasSize.x, vPos.y * uCanvasSize.y); \n vec2 pos = vec2(vPos.x * uCanvasSize.x, vPos.y * uCanvasSize.y); \n
highp vec2 spos = vec2(pos.x / uSize.x, pos.y / uSize.y); \n vec2 spos = vec2(pos.x / uSize.x, pos.y / uSize.y); \n
highp vec2 st = gradStartPos / (uSize.xy); \n vec2 st = gradStartPos / (uSize.xy); \n
highp vec2 ed = gradEndPos / (uSize.xy); \n vec2 ed = gradEndPos / (uSize.xy); \n
\n \n
highp vec2 ba = ed - st; \n vec2 ba = ed - st; \n
\n \n
highp float t = dot(spos - st, ba) / dot(ba, ba); \n float t = dot(spos - st, ba) / dot(ba, ba); \n
\n \n
//t = smoothstep(0.0, 1.0, clamp(t, 0.0, 1.0)); \n //t = smoothstep(0.0, 1.0, clamp(t, 0.0, 1.0)); \n
t = clamp(t, 0.0, 1.0); \n t = clamp(t, 0.0, 1.0); \n
\n \n
vec4 color = gradient(t); \n vec4 color = gradient(t); \n
\n \n
highp vec3 noise = 8.0 * noise_level * ScreenSpaceDither(pos); \n vec3 noise = 8.0 * noise_level * ScreenSpaceDither(pos); \n
vec4 finalCol = vec4(color.xyz + noise, color.w); \n vec4 finalCol = vec4(color.xyz + noise, color.w); \n
gl_FragColor = vec4(finalCol.xyz, finalCol.w* vOpacity); \n FragColor = vec4(finalCol.xyz, finalCol.w* vOpacity); \n
}); });
std::string STR_RADIAL_GRADIENT_VARIABLES = TVG_COMPOSE_SHADER( std::string STR_RADIAL_GRADIENT_VARIABLES = TVG_COMPOSE_SHADER(
uniform highp vec2 gradStartPos; \n uniform vec2 gradStartPos; \n
uniform highp float stRadius; \n uniform float stRadius; \n
); );
std::string STR_RADIAL_GRADIENT_MAIN = TVG_COMPOSE_SHADER( std::string STR_RADIAL_GRADIENT_MAIN = TVG_COMPOSE_SHADER(
out vec4 FragColor; \n
void main() \n void main() \n
{ \n { \n
highp vec2 pos = vec2(vPos.x * uCanvasSize.x, vPos.y * uCanvasSize.y); \n vec2 pos = vec2(vPos.x * uCanvasSize.x, vPos.y * uCanvasSize.y); \n
highp vec2 spos = vec2(pos.x / uSize.x, pos.y / uSize.y); \n vec2 spos = vec2(pos.x / uSize.x, pos.y / uSize.y); \n
\n \n
highp float ba = stRadius; \n float ba = stRadius; \n
highp float d = distance(gradStartPos, pos); \n float d = distance(gradStartPos, pos); \n
d = (d / ba); \n d = (d / ba); \n
\n \n
//float t = smoothstep(0.0, 1.0, clamp(d, 0.0, 1.0)); \n //float t = smoothstep(0.0, 1.0, clamp(d, 0.0, 1.0)); \n
@ -161,9 +163,9 @@ void main()
\n \n
vec4 color = gradient(t); \n vec4 color = gradient(t); \n
\n \n
highp vec3 noise = 8.0 * noise_level * ScreenSpaceDither(pos); \n vec3 noise = 8.0 * noise_level * ScreenSpaceDither(pos); \n
vec4 finalCol = vec4(color.xyz + noise, color.w); \n vec4 finalCol = vec4(color.xyz + noise, color.w); \n
gl_FragColor = vec4(finalCol.xyz, finalCol.w * vOpacity); \n FragColor = vec4(finalCol.xyz, finalCol.w * vOpacity); \n
}); });
std::string STR_LINEAR_GRADIENT_FRAG_SHADER = std::string STR_LINEAR_GRADIENT_FRAG_SHADER =