Compare commits
No commits in common. "d7a6bc4ae46cc5deeadaa1213bd0bf91a70376ce" and "d9b676d1b29205e23ad3778feec5e76909eed000" have entirely different histories.
d7a6bc4ae4
...
d9b676d1b2
7
deps/ox/src/ox/mc/read.hpp
vendored
7
deps/ox/src/ox/mc/read.hpp
vendored
@ -248,17 +248,12 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, HashMap<Stri
|
||||
auto reader = child("");
|
||||
auto &handler = *reader.interface();
|
||||
oxReturnError(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
|
||||
// this loop body needs to be in a lambda because of the potential alloca call
|
||||
constexpr auto loopBody = [](auto& handler) {
|
||||
for (std::size_t i = 0; i < len; ++i) {
|
||||
oxRequire(keyLen, handler.stringLength(nullptr));
|
||||
auto wkey = ox_malloca(keyLen + 1, char, 0);
|
||||
auto wkeyPtr = wkey.get();
|
||||
oxReturnError(handler.fieldCString("", &wkeyPtr, keyLen + 1));
|
||||
oxReturnError(handler.field("", &val->operator[](wkey.get())));
|
||||
return OxError(0);
|
||||
};
|
||||
for (std::size_t i = 0; i < len; ++i) {
|
||||
oxReturnError(loopBody(handler));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -357,9 +357,9 @@ ox::Error initGfx(
|
||||
for (auto &bg : gctx.cbbs) {
|
||||
initBackgroundBufferset(gctx.bgShader, bg);
|
||||
}
|
||||
initSpritesBufferset(gctx.spriteShader, gctx.spriteBlocks);
|
||||
if (initParams.glInstallDrawer) {
|
||||
turbine::gl::addDrawer(gctx.turbineCtx, &gctx.drawer);
|
||||
initSpritesBufferset(gctx.spriteShader, gctx.spriteBlocks);
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user