Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

example 62 fix #162

Merged
merged 2 commits into from
Dec 18, 2024
Merged

example 62 fix #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7d1600
Fixes
Przemog1 Dec 11, 2024
73ac5c8
Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla-…
Przemog1 Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions 62_CAD/DrawResourcesFiller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ void DrawResourcesFiller::submitCurrentDrawObjectsAndReset(SIntendedSubmitInfo&
// then modify the mainObject data
getMainObject(mainObjectIndex)->clipProjectionAddress = newClipProjectionAddress;
// we need to rewind back inMemMainObjectCount to this mainObjIndex so it re-uploads the current mainObject (because we modified it)
inMemMainObjectCount = min(inMemMainObjectCount, mainObjectIndex);
inMemMainObjectCount = std::min(inMemMainObjectCount, mainObjectIndex);
}
}

Expand Down Expand Up @@ -737,8 +737,8 @@ void DrawResourcesFiller::addPolylineConnectors_Internal(const CPolylineBase& po
const auto maxGeometryBufferConnectors = (maxGeometryBufferSize - currentGeometryBufferSize) / sizeof(PolylineConnector);

uint32_t uploadableObjects = (maxIndexCount / 6u) - currentDrawObjectCount;
uploadableObjects = min(uploadableObjects, maxGeometryBufferConnectors);
uploadableObjects = min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);
uploadableObjects = std::min(static_cast<uint64_t>(uploadableObjects), maxGeometryBufferConnectors);
uploadableObjects = std::min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);

const auto connectorCount = polyline.getConnectors().size();
const auto remainingObjects = connectorCount - currentPolylineConnectorObj;
Expand Down Expand Up @@ -780,12 +780,12 @@ void DrawResourcesFiller::addLines_Internal(const CPolylineBase& polyline, const
const auto maxGeometryBufferLines = (maxGeometryBufferPoints <= 1u) ? 0u : maxGeometryBufferPoints - 1u;

uint32_t uploadableObjects = (maxIndexCount / 6u) - currentDrawObjectCount;
uploadableObjects = min(uploadableObjects, maxGeometryBufferLines);
uploadableObjects = min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);
uploadableObjects = std::min(static_cast<uint64_t>(uploadableObjects), maxGeometryBufferLines);
uploadableObjects = std::min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);

const auto lineCount = section.count;
const auto remainingObjects = lineCount - currentObjectInSection;
uint32_t objectsToUpload = min(uploadableObjects, remainingObjects);
uint32_t objectsToUpload = std::min(uploadableObjects, remainingObjects);

// Add DrawObjs
DrawObject drawObj = {};
Expand Down Expand Up @@ -821,13 +821,13 @@ void DrawResourcesFiller::addQuadBeziers_Internal(const CPolylineBase& polyline,
const auto maxGeometryBufferBeziers = (maxGeometryBufferSize - currentGeometryBufferSize) / sizeof(QuadraticBezierInfo);

uint32_t uploadableObjects = (maxIndexCount / 6u) - currentDrawObjectCount;
uploadableObjects = min(uploadableObjects, maxGeometryBufferBeziers);
uploadableObjects = min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);
uploadableObjects = std::min(static_cast<uint64_t>(uploadableObjects), maxGeometryBufferBeziers);
uploadableObjects = std::min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);
uploadableObjects /= CagesPerQuadBezier;

const auto beziersCount = section.count;
const auto remainingObjects = beziersCount - currentObjectInSection;
uint32_t objectsToUpload = min(uploadableObjects, remainingObjects);
uint32_t objectsToUpload = std::min(uploadableObjects, remainingObjects);

// Add DrawObjs
DrawObject drawObj = {};
Expand Down Expand Up @@ -863,11 +863,11 @@ void DrawResourcesFiller::addHatch_Internal(const Hatch& hatch, uint32_t& curren
const auto maxGeometryBufferHatchBoxes = (maxGeometryBufferSize - currentGeometryBufferSize) / sizeof(Hatch::CurveHatchBox);

uint32_t uploadableObjects = (maxIndexCount / 6u) - currentDrawObjectCount;
uploadableObjects = min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);
uploadableObjects = min(uploadableObjects, maxGeometryBufferHatchBoxes);
uploadableObjects = std::min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);
uploadableObjects = std::min(static_cast<uint64_t>(uploadableObjects), maxGeometryBufferHatchBoxes);

uint32_t remainingObjects = hatch.getHatchBoxCount() - currentObjectInSection;
uploadableObjects = min(uploadableObjects, remainingObjects);
uploadableObjects = std::min(uploadableObjects, remainingObjects);

for (uint32_t i = 0; i < uploadableObjects; i++)
{
Expand Down Expand Up @@ -900,8 +900,8 @@ bool DrawResourcesFiller::addFontGlyph_Internal(const GlyphInfo& glyphInfo, uint
const auto maxGeometryBufferFontGlyphs = (maxGeometryBufferSize - currentGeometryBufferSize) / sizeof(GlyphInfo);

uint32_t uploadableObjects = (maxIndexCount / 6u) - currentDrawObjectCount;
uploadableObjects = min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);
uploadableObjects = min(uploadableObjects, maxGeometryBufferFontGlyphs);
uploadableObjects = std::min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);
uploadableObjects = std::min(static_cast<uint64_t>(uploadableObjects), maxGeometryBufferFontGlyphs);

if (uploadableObjects >= 1u)
{
Expand Down
4 changes: 2 additions & 2 deletions 62_CAD/DrawResourcesFiller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ struct DrawResourcesFiller
{
const auto maxGeometryBufferImageObjects = (maxGeometryBufferSize - currentGeometryBufferSize) / sizeof(ImageObjectInfo);
uint32_t uploadableObjects = (maxIndexCount / 6u) - currentDrawObjectCount;
uploadableObjects = min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);
uploadableObjects = min(uploadableObjects, maxGeometryBufferImageObjects);
uploadableObjects = std::min(uploadableObjects, maxDrawObjects - currentDrawObjectCount);
uploadableObjects = std::min(static_cast<uint64_t>(uploadableObjects), maxGeometryBufferImageObjects);

if (uploadableObjects >= 1u)
{
Expand Down