From 54701868da3df0f00b554d71616ab54990ee47d8 Mon Sep 17 00:00:00 2001 From: Vladislav Belov Date: Sat, 4 Jan 2025 15:13:10 +0100 Subject: [PATCH] Fixes GLES compilation. --- source/renderer/backend/gl/Buffer.cpp | 2 ++ source/renderer/backend/gl/DeviceCommandContext.cpp | 8 ++++++++ source/renderer/backend/gl/ShaderProgram.cpp | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/source/renderer/backend/gl/Buffer.cpp b/source/renderer/backend/gl/Buffer.cpp index 99089ac64e..fce137a0d2 100644 --- a/source/renderer/backend/gl/Buffer.cpp +++ b/source/renderer/backend/gl/Buffer.cpp @@ -46,9 +46,11 @@ GLenum GetTargetFromBufferType(const IBuffer::Type type) case IBuffer::Type::INDEX: target = GL_ELEMENT_ARRAY_BUFFER; break; +#if !CONFIG2_GLES case IBuffer::Type::UNIFORM: target = GL_UNIFORM_BUFFER; break; +#endif default: target = GL_ARRAY_BUFFER; break; diff --git a/source/renderer/backend/gl/DeviceCommandContext.cpp b/source/renderer/backend/gl/DeviceCommandContext.cpp index 8b1567d6e4..dacdd4377b 100644 --- a/source/renderer/backend/gl/DeviceCommandContext.cpp +++ b/source/renderer/backend/gl/DeviceCommandContext.cpp @@ -104,7 +104,11 @@ GLenum BufferTypeToGLTarget(const CBuffer::Type type) target = GL_ELEMENT_ARRAY_BUFFER; break; case CBuffer::Type::UNIFORM: +#if !CONFIG2_GLES target = GL_UNIFORM_BUFFER; +#else + debug_warn("Unsupported buffer type."); +#endif break; case CBuffer::Type::UPLOAD: debug_warn("Unsupported buffer type."); @@ -1304,6 +1308,10 @@ void CDeviceCommandContext::InsertMemoryBarrier( } if (barriers) glMemoryBarrier(barriers); +#else + UNUSED2(dstStageMask); + UNUSED2(srcAccessMask); + UNUSED2(dstAccessMask); #endif } diff --git a/source/renderer/backend/gl/ShaderProgram.cpp b/source/renderer/backend/gl/ShaderProgram.cpp index ea78921630..ed0d70dd2b 100644 --- a/source/renderer/backend/gl/ShaderProgram.cpp +++ b/source/renderer/backend/gl/ShaderProgram.cpp @@ -1039,8 +1039,10 @@ public: ENSURE(this != previousShaderProgramGLSL); glUseProgram(m_Program); +#if !CONFIG2_GLES if (m_UniformBuffer) glBindBufferBase(GL_UNIFORM_BUFFER, m_UniformBufferLocation, m_UniformBuffer->As()->GetHandle()); +#endif if (previousShaderProgramGLSL) { @@ -1485,7 +1487,7 @@ std::unique_ptr CShaderProgram::Create(CDevice* device, const CS const PS::StaticVector, 2> shaderStages{computeFile.empty() ? PS::StaticVector, 2>{{vertexFile, GL_VERTEX_SHADER}, {fragmentFile, GL_FRAGMENT_SHADER}} : PS::StaticVector, 2>{{computeFile, GL_COMPUTE_SHADER}}}; -#else +#else const PS::StaticVector, 2> shaderStages{{{vertexFile, GL_VERTEX_SHADER}, {fragmentFile, GL_FRAGMENT_SHADER}}}; #endif