sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renderer: Add NazaraBinary shader "language" and handle it in OpenGLRenderer

This commit is contained in:
Lynix 2020-06-18 20:05:22 +02:00
parent 58e59be267
commit 4f671873c1
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/VulkanTest/main.cpp
View File

@ -3,7 +3,7 @@
#include <array> #include <array>
#include <iostream> #include <iostream>
#define SPIRV 1 #define SPIRV 0
int main() int main()
{ {
@ -44,7 +44,7 @@ int main()
return __LINE__; return __LINE__;
} }
#else #else
auto fragmentShader = device->InstantiateShaderStage(Nz::ShaderStageType::Fragment, Nz::ShaderLanguage::GLSL, "resources/shaders/triangle.frag"); auto fragmentShader = device->InstantiateShaderStage(Nz::ShaderStageType::Fragment, Nz::ShaderLanguage::NazaraBinary, "shader.shader");
if (!fragmentShader) if (!fragmentShader)
{ {
std::cout << "Failed to instantiate fragment shader" << std::endl; std::cout << "Failed to instantiate fragment shader" << std::endl;

BIN
examples/bin/shader.shader Normal file
View File

Binary file not shown.

1
include/Nazara/Renderer/Enums.hpp
View File

@ -49,6 +49,7 @@ namespace Nz
GLSL, GLSL,
HLSL, HLSL,
MSL, MSL,
NazaraBinary,
SpirV SpirV
}; };

32
src/Nazara/OpenGLRenderer/OpenGLShaderStage.cpp
View File

@ -4,7 +4,11 @@
#include <Nazara/OpenGLRenderer/OpenGLShaderStage.hpp> #include <Nazara/OpenGLRenderer/OpenGLShaderStage.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/MemoryView.hpp>
#include <Nazara/OpenGLRenderer/Utils.hpp> #include <Nazara/OpenGLRenderer/Utils.hpp>
#include <Nazara/Renderer/GlslWriter.hpp>
#include <Nazara/Renderer/ShaderAst.hpp>
#include <Nazara/Renderer/ShaderSerializer.hpp>
#include <stdexcept> #include <stdexcept>
#include <Nazara/OpenGLRenderer/Debug.hpp> #include <Nazara/OpenGLRenderer/Debug.hpp>
@ -22,6 +26,34 @@ namespace Nz
m_shader.Compile(); m_shader.Compile();
break; break;
case ShaderLanguage::NazaraBinary:
{
ByteStream byteStream(source, sourceSize);
auto shader = Nz::UnserializeShader(byteStream);
const auto& context = device.GetReferenceContext();
const auto& contextParams = context.GetParams();
GlslWriter::Environment env;
env.glES = false;
//env.glES = (contextParams.type == GL::ContextType::OpenGL_ES);
env.glMajorVersion = contextParams.glMajorVersion;
env.glMinorVersion = contextParams.glMinorVersion;
env.extCallback = [&](const std::string_view& ext)
{
return context.IsExtensionSupported(std::string(ext));
};
GlslWriter writer;
writer.SetEnv(env);
std::string code = writer.Generate(shader);
m_shader.SetSource(code.data(), code.size());
m_shader.Compile();
break;
}
case ShaderLanguage::SpirV: case ShaderLanguage::SpirV:
{ {
if (!device.GetReferenceContext().IsExtensionSupported(GL::Extension::SpirV)) if (!device.GetReferenceContext().IsExtensionSupported(GL::Extension::SpirV))