Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix UWP build 

- Use compatible GLES API: glGetActiveUniform
- glGetActiveUniformName not present in both GLES3 and GLES2
This commit is contained in:
halx99 2023-07-18 00:10:57 +08:00
parent e261f8d913
commit e52da4da43
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/renderer/backend/opengl/ProgramGL.cpp
View File

@ -31,6 +31,7 @@
#include "base/EventDispatcher.h" #include "base/EventDispatcher.h"
#include "base/EventType.h" #include "base/EventType.h"
#include "base/axstd.h" #include "base/axstd.h"
#include "yasio/byte_buffer.hpp"
#include "renderer/backend/opengl/UtilsGL.h" #include "renderer/backend/opengl/UtilsGL.h"
NS_AX_BACKEND_BEGIN NS_AX_BACKEND_BEGIN
@ -296,7 +297,7 @@ void ProgramGL::computeUniformInfos()
} }
uniform.location = glGetUniformLocation(_program, uniformName); uniform.location = glGetUniformLocation(_program, uniformName);
uniform.size = UtilsGL::getGLDataTypeSize(uniform.type); uniform.size = UtilsGL::getGLDataTypeSize(uniform.type);
uniform.bufferOffset = (uniform.size == 0) ? 0 : (uniform.isFragment ? _totalFragBufferSize : _totalVertBufferSize); uniform.bufferOffset = (uniform.size == 0u) ? 0 : static_cast<unsigned>(uniform.isFragment ? _totalFragBufferSize : _totalVertBufferSize);
if (_activeUniformInfos.find(uniformName) == _activeUniformInfos.end()) if (_activeUniformInfos.find(uniformName) == _activeUniformInfos.end())
_activeUniformInfos[uniformName] = uniform; _activeUniformInfos[uniformName] = uniform;
(uniform.isFragment ? _totalFragBufferSize : _totalVertBufferSize) += uniform.size * uniform.count; (uniform.isFragment ? _totalFragBufferSize : _totalVertBufferSize) += uniform.size * uniform.count;
@ -348,6 +349,7 @@ inline std::string_view mapLocationEnumToUBO(backend::Uniform name)
return UNIFORM_NAME_EFFECT_TYPE; return UNIFORM_NAME_EFFECT_TYPE;
break; break;
} }
return ""sv;
} }
UniformLocation ProgramGL::getUniformLocation(backend::Uniform name) const UniformLocation ProgramGL::getUniformLocation(backend::Uniform name) const
@ -474,32 +476,33 @@ void UniformBlockHandler::generateUniformOffsets(UniformBlockStage _stage)
vertBlockSize = _stage == UniformBlockStage::VERTEX ? ubo.blockSize : vertBlockSize; vertBlockSize = _stage == UniformBlockStage::VERTEX ? ubo.blockSize : vertBlockSize;
fragBlockSize = _stage == UniformBlockStage::FRAGMENT ? ubo.blockSize : fragBlockSize; fragBlockSize = _stage == UniformBlockStage::FRAGMENT ? ubo.blockSize : fragBlockSize;
for (GLuint i = 0; i < ubo.numUniforms; ++i) yasio::basic_byte_buffer<GLchar> buffer;
for (GLint i = 0; i < ubo.numUniforms; ++i)
{ {
GLint uniformOffset = ubo.uniformOffsets[i]; GLint uniformOffset = ubo.uniformOffsets[i];
GLsizei bufferSize = MAX_UNIFORM_NAME_LENGTH; buffer.resize(MAX_UNIFORM_NAME_LENGTH, std::true_type{});
GLchar* buffer;
buffer = new GLchar[bufferSize];
GLint index = ubo.uniformIndices[i]; GLint index = ubo.uniformIndices[i];
glGetActiveUniformName(_program, ubo.uniformIndices[i], bufferSize, nullptr, buffer);
GLchar* newBuffer = buffer; GLsizei cch{};
GLenum dataType{};
GLint arrayCount{};
glGetActiveUniform(_program, ubo.uniformIndices[i], MAX_UNIFORM_NAME_LENGTH, &cch, &arrayCount,
&dataType,
buffer.data());
std::string_view uniformName{buffer.data(), static_cast<size_t>(cch)};
while (newBuffer[0] != '.') auto dot = uniformName.find_last_of('.');
newBuffer++; if (dot != std::string::npos)
if (newBuffer[0] == '.') uniformName.remove_prefix(dot + 1);
newBuffer++;
auto loc = UniformLocation{}; auto loc = UniformLocation{};
loc.location[0] = UNIFORM_BLOCK_IDENTIFIER; loc.location[0] = UNIFORM_BLOCK_IDENTIFIER;
loc.location[1] = uniformOffset / sizeof(float); loc.location[1] = uniformOffset / sizeof(float);
loc.shaderStage = _stage == UniformBlockStage::VERTEX ? ShaderStage::VERTEX : ShaderStage::FRAGMENT; loc.shaderStage = _stage == UniformBlockStage::VERTEX ? ShaderStage::VERTEX : ShaderStage::FRAGMENT;
uniformOffsetsByName.insert({newBuffer, loc}); uniformOffsetsByName.emplace(std::string{uniformName}, loc);
delete[] buffer;
} }
} }
} }