LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

use 'thread' and 'threadgroup' terminology in compute shader code.

Browse Source 
Also fix compute shaders including some rendering-specific code.
This commit is contained in:
Alex Szpakowski
2021-08-14 20:42:46 -03:00
parent 601d4e120d
commit 63e3bd1823
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Shader.cpp
+17 -10
View File
@@ -80,7 +80,7 @@ static const char global_syntax[] = R"(
#endif #endif
)"; )";
static const char global_uniforms[] = R"( static const char render_uniforms[] = R"(
// According to the GLSL ES 1.0 spec, uniform precision must match between stages, // According to the GLSL ES 1.0 spec, uniform precision must match between stages,
// but we can't guarantee that highp is always supported in fragment shaders... // but we can't guarantee that highp is always supported in fragment shaders...
// We *really* don't want to use mediump for these in vertex shaders though. // We *really* don't want to use mediump for these in vertex shaders though.
@@ -390,11 +390,16 @@ void main() {
)"; )";
static const char compute_header[] = R"( static const char compute_header[] = R"(
#define love_NumWorkGroups gl_NumWorkGroups #define love_ThreadGroupCount gl_NumWorkGroups
#define love_WorkGroupID gl_WorkGroupID #define love_ThreadGroupID gl_WorkGroupID
#define love_LocalInvocationID gl_LocalInvocationID #define love_LocalThreadID gl_LocalInvocationID
#define love_GlobalInvocationID gl_GlobalInvocationID #define love_GlobalThreadID gl_GlobalInvocationID
#define love_LocalInvocationIndex gl_LocalInvocationIndex #define love_LocalThreadIndex gl_LocalInvocationIndex
#define love_ThreadGroupSize gl_WorkGroupSize
)";
static const char compute_uniforms[] = R"(
void love_initializeBuiltinUniforms() {}
)"; )";
static const char compute_functions[] = R"()"; static const char compute_functions[] = R"()";
@@ -403,6 +408,7 @@ static const char compute_main[] = R"(
void computemain(); void computemain();
void main() { void main() {
love_initializeBuiltinUniforms();
computemain(); computemain();
} }
)"; )";
@@ -411,6 +417,7 @@ struct StageInfo
{ {
const char *name; const char *name;
const char *header; const char *header;
const char *uniforms;
const char *functions; const char *functions;
const char *main; const char *main;
const char *main_custom; const char *main_custom;
@@ -419,9 +426,9 @@ struct StageInfo
static const StageInfo stageInfo[] = static const StageInfo stageInfo[] =
{ {
{ "VERTEX", vertex_header, vertex_functions, vertex_main, vertex_main, vertex_main_raw }, { "VERTEX", vertex_header, render_uniforms, vertex_functions, vertex_main, vertex_main, vertex_main_raw },
{ "PIXEL", pixel_header, pixel_functions, pixel_main, pixel_main_custom, pixel_main_raw }, { "PIXEL", pixel_header, render_uniforms, pixel_functions, pixel_main, pixel_main_custom, pixel_main_raw },
{ "COMPUTE", compute_header, compute_functions, compute_main, compute_main, compute_main }, { "COMPUTE", compute_header, compute_uniforms, compute_functions, compute_main, compute_main, compute_main },
}; };
static_assert((sizeof(stageInfo) / sizeof(StageInfo)) == SHADERSTAGE_MAX_ENUM, "Stages array size must match ShaderStage enum."); static_assert((sizeof(stageInfo) / sizeof(StageInfo)) == SHADERSTAGE_MAX_ENUM, "Stages array size must match ShaderStage enum.");
@@ -564,7 +571,7 @@ std::string Shader::createShaderStageCode(Graphics *gfx, ShaderStageType stage,
ss << "#define LOVE_MULTI_RENDER_TARGETS 1"; ss << "#define LOVE_MULTI_RENDER_TARGETS 1";
ss << glsl::global_syntax; ss << glsl::global_syntax;
ss << stageinfo.header; ss << stageinfo.header;
ss << glsl::global_uniforms; ss << stageinfo.uniforms;
ss << glsl::global_functions; ss << glsl::global_functions;
ss << stageinfo.functions; ss << stageinfo.functions;