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

Minor fixes

This commit is contained in:
Lynix 2020-04-26 18:22:07 +02:00
parent 32157503e8
commit b7a7c84a89
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/VulkanTest/main.cpp
View File

@ -110,7 +110,7 @@ int main()
textureBinding.shaderStageFlags = Nz::ShaderStageType::Fragment; textureBinding.shaderStageFlags = Nz::ShaderStageType::Fragment;
textureBinding.type = Nz::ShaderBindingType::Texture; textureBinding.type = Nz::ShaderBindingType::Texture;
std::shared_ptr<Nz::RenderPipelineLayout> renderPipelineLayout = device->InstantiateRenderPipelineLayout(pipelineLayoutInfo); std::shared_ptr<Nz::RenderPipelineLayout> renderPipelineLayout = device->InstantiateRenderPipelineLayout(std::move(pipelineLayoutInfo));
Nz::ShaderBindingPtr shaderBinding = renderPipelineLayout->AllocateShaderBinding(); Nz::ShaderBindingPtr shaderBinding = renderPipelineLayout->AllocateShaderBinding();

2
include/Nazara/OpenGLRenderer/Wrapper/Sampler.inl
View File

@ -39,7 +39,7 @@ namespace Nz::GL
context.glSamplerParameteriv(m_objectId, pname, param); context.glSamplerParameteriv(m_objectId, pname, param);
} }
inline GLuint Sampler::CreateHelper(OpenGLDevice& device, const Context& context) inline GLuint Sampler::CreateHelper(OpenGLDevice& /*device*/, const Context& context)
{ {
GLuint sampler = 0; GLuint sampler = 0;
context.glGenSamplers(1U, &sampler); context.glGenSamplers(1U, &sampler);

4
include/Nazara/OpenGLRenderer/Wrapper/Shader.inl
View File

@ -11,7 +11,9 @@ namespace Nz::GL
inline void Shader::Compile() inline void Shader::Compile()
{ {
assert(m_objectId); assert(m_objectId);
m_device->GetReferenceContext().glCompileShader(m_objectId);
const Context& context = EnsureDeviceContext();
context.glCompileShader(m_objectId);
} }
inline bool Shader::GetCompilationStatus(std::string* error) inline bool Shader::GetCompilationStatus(std::string* error)

4
src/Nazara/OpenGLRenderer/OpenGLDevice.cpp
View File

@ -8,6 +8,7 @@
#include <Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp> #include <Nazara/OpenGLRenderer/OpenGLRenderPipelineLayout.hpp>
#include <Nazara/OpenGLRenderer/OpenGLShaderStage.hpp> #include <Nazara/OpenGLRenderer/OpenGLShaderStage.hpp>
#include <Nazara/OpenGLRenderer/OpenGLTexture.hpp> #include <Nazara/OpenGLRenderer/OpenGLTexture.hpp>
#include <Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp>
#include <Nazara/OpenGLRenderer/Wrapper/Loader.hpp> #include <Nazara/OpenGLRenderer/Wrapper/Loader.hpp>
#include <stdexcept> #include <stdexcept>
#include <Nazara/OpenGLRenderer/Debug.hpp> #include <Nazara/OpenGLRenderer/Debug.hpp>
@ -74,6 +75,7 @@ namespace Nz
std::unique_ptr<TextureSampler> OpenGLDevice::InstantiateTextureSampler(const TextureSamplerInfo& params) std::unique_ptr<TextureSampler> OpenGLDevice::InstantiateTextureSampler(const TextureSamplerInfo& params)
{ {
return {}; return std::make_unique<OpenGLTextureSampler>(*this, params);
} }
} }