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

Minor stuff

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-01-22 23:23:28 +01:00
parent d52be87fd5
commit a6ff64106e
10 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,6 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/OpenGLRenderer/OpenGLShaderStage.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/MemoryView.hpp>
#include <Nazara/OpenGLRenderer/Utils.hpp>
#include <Nazara/Shader/GlslWriter.hpp>
@@ -89,8 +88,6 @@ namespace Nz
std::string code = writer.Generate(shaderAst, states);
NazaraError(code);
m_shader.SetSource(code.data(), code.size());
m_shader.Compile();
}

2
src/Nazara/OpenGLRenderer/OpenGLVaoCache.cpp
View File

@@ -30,7 +30,7 @@ namespace Nz::GL
if (setup.indexBuffer != 0)
m_context.BindBuffer(BufferTarget::ElementArray, setup.indexBuffer, true);
std::size_t bindingIndex = 0;
GLuint bindingIndex = 0;
for (const auto& attribOpt : setup.vertexAttribs)
{
if (attribOpt)

15
src/Nazara/VulkanRenderer/VulkanTexture.cpp
View File

@@ -227,8 +227,23 @@ namespace Nz
VK_COMPONENT_SWIZZLE_A
};
// TODO: Fill this switch
switch (pixelFormat)
{
case PixelFormat_BGR8:
{
createImage.format = VK_FORMAT_B8G8R8_SRGB;
createImageView.format = createImage.format;
break;
}
case PixelFormat_BGRA8:
{
createImage.format = VK_FORMAT_B8G8R8A8_SRGB;
createImageView.format = createImage.format;
break;
}
case PixelFormat_L8:
{
createImage.format = VK_FORMAT_R8_SRGB;