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

metal: use EXT_vulkan_glsl_relaxed

Browse Source
This commit is contained in:
Alex Szpakowski
2021-03-23 21:57:36 -03:00
parent cc140ed1ad
commit c0a8aa3ef7
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Shader.cpp
-8
View File
@@ -88,13 +88,7 @@ static const char global_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.
#if __VERSION__ >= 300 && defined(LOVE_USE_UNIFORM_BUFFERS)
layout (std140) uniform love_UniformsPerDrawBuffer {
highp vec4 love_UniformsPerDraw[13];
};
#else
uniform LOVE_HIGHP_OR_MEDIUMP vec4 love_UniformsPerDraw[13]; uniform LOVE_HIGHP_OR_MEDIUMP vec4 love_UniformsPerDraw[13];
#endif
// These are initialized in love_initializeBuiltinUniforms below. GLSL ES can't // These are initialized in love_initializeBuiltinUniforms below. GLSL ES can't
// do it as an initializer. // do it as an initializer.
@@ -536,8 +530,6 @@ std::string Shader::createShaderStageCode(Graphics *gfx, ShaderStage::StageType
ss << "#define LOVE_GAMMA_CORRECT 1\n"; ss << "#define LOVE_GAMMA_CORRECT 1\n";
if (info.usesMRT) if (info.usesMRT)
ss << "#define LOVE_MULTI_RENDER_TARGETS 1\n"; ss << "#define LOVE_MULTI_RENDER_TARGETS 1\n";
if (gfx->getRenderer() == Graphics::RENDERER_METAL)
ss << "#define LOVE_USE_UNIFORM_BUFFERS 1\n"; // FIXME: this is temporary
ss << glsl::global_syntax; ss << glsl::global_syntax;
ss << stageinfo.header; ss << stageinfo.header;
ss << glsl::global_uniforms; ss << glsl::global_uniforms;
src/modules/graphics/metal/Shader.mm
+1 -1
View File
@@ -250,7 +250,7 @@ Shader::Shader(id<MTLDevice> device, love::graphics::ShaderStage *vertex, love::
continue; continue;
} }
if (resource.name == "love_UniformsPerDrawBuffer") if (resource.name == "gl_DefaultUniformBlock")
{ {
msl.set_decoration(resource.id, spv::DecorationBinding, 0); msl.set_decoration(resource.id, spv::DecorationBinding, 0);
const SPIRType &type = msl.get_type(resource.base_type_id); const SPIRType &type = msl.get_type(resource.base_type_id);
src/modules/graphics/metal/ShaderStage.mm
+4 -3
View File
@@ -154,11 +154,12 @@ ShaderStage::ShaderStage(love::graphics::Graphics *gfx, StageType stage, const s
// We can't reuse the validation glslang shader object in the base class, // We can't reuse the validation glslang shader object in the base class,
// because we need these options set (and the language set to >= 300). // because we need these options set (and the language set to >= 300).
glslangShader->setEnvInput(EShSourceGlsl, glslangStage, EShClientNone, 0); glslangShader->setEnvInput(EShSourceGlsl, glslangStage, EShClientVulkan, 450);
glslangShader->setEnvClient(EShClientOpenGL, EShTargetOpenGL_450); glslangShader->setEnvClient(EShClientVulkan, EShTargetVulkan_1_2);
glslangShader->setEnvTarget(EShTargetSpv, EShTargetSpv_1_0); glslangShader->setEnvTarget(EShTargetSpv, EShTargetSpv_1_5);
glslangShader->setAutoMapLocations(true); glslangShader->setAutoMapLocations(true);
glslangShader->setAutoMapBindings(true); glslangShader->setAutoMapBindings(true);
glslangShader->setEnvInputVulkanRulesRelaxed();
const char *csrc = source.c_str(); const char *csrc = source.c_str();
int srclen = (int) source.length(); int srclen = (int) source.length();