blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 11:00:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix GLEW clang-tidy issues

Browse source
This commit is contained in:
Dan Paulat 2025-07-10 23:27:24 -05:00
parent 331b2d855f
commit a6f8547455
15 changed files with 176 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

35
scwx-qt/source/scwx/qt/gl/draw/geo_icons.cpp
View file

@ -186,6 +186,10 @@ void GeoIcons::Initialize()
glBindBuffer(GL_ARRAY_BUFFER, p->vbo_[0]);
glBufferData(GL_ARRAY_BUFFER, 0u, nullptr, GL_DYNAMIC_DRAW);
// NOLINTBEGIN(modernize-use-nullptr)
// NOLINTBEGIN(performance-no-int-to-ptr)
// NOLINTBEGIN(cppcoreguidelines-avoid-magic-numbers)
// aLatLong
glVertexAttribPointer(0,
2,
@ -261,6 +265,10 @@ void GeoIcons::Initialize()
reinterpret_cast<void*>(3 * sizeof(GLint)));
glEnableVertexAttribArray(7);
// NOLINTEND(cppcoreguidelines-avoid-magic-numbers)
// NOLINTEND(performance-no-int-to-ptr)
// NOLINTEND(modernize-use-nullptr)
p->dirty_ = true;
}
@ -857,10 +865,11 @@ void GeoIcons::Impl::Update(bool textureAtlasChanged)
// Buffer texture data
glBindBuffer(GL_ARRAY_BUFFER, vbo_[1]);
glBufferData(GL_ARRAY_BUFFER,
sizeof(float) * textureBuffer_.size(),
textureBuffer_.data(),
GL_DYNAMIC_DRAW);
glBufferData(
GL_ARRAY_BUFFER,
static_cast<GLsizeiptr>(sizeof(float) * textureBuffer_.size()),
textureBuffer_.data(),
GL_DYNAMIC_DRAW);
lastTextureAtlasChanged_ = false;
}
@ -870,17 +879,19 @@ void GeoIcons::Impl::Update(bool textureAtlasChanged)
{
// Buffer vertex data
glBindBuffer(GL_ARRAY_BUFFER, vbo_[0]);
glBufferData(GL_ARRAY_BUFFER,
sizeof(float) * currentIconBuffer_.size(),
currentIconBuffer_.data(),
GL_DYNAMIC_DRAW);
glBufferData(
GL_ARRAY_BUFFER,
static_cast<GLsizeiptr>(sizeof(float) * currentIconBuffer_.size()),
currentIconBuffer_.data(),
GL_DYNAMIC_DRAW);
// Buffer threshold data
glBindBuffer(GL_ARRAY_BUFFER, vbo_[2]);
glBufferData(GL_ARRAY_BUFFER,
sizeof(GLint) * currentIntegerBuffer_.size(),
currentIntegerBuffer_.data(),
GL_DYNAMIC_DRAW);
glBufferData(
GL_ARRAY_BUFFER,
static_cast<GLsizeiptr>(sizeof(GLint) * currentIntegerBuffer_.size()),
currentIntegerBuffer_.data(),
GL_DYNAMIC_DRAW);
numVertices_ =
static_cast<GLsizei>(currentIconBuffer_.size() / kPointsPerVertex);