RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed problem with compiler overoptimization

Browse Source
This commit is contained in:
h4570
2022-08-18 23:06:07 +02:00
parent 1ba2cb55b7
commit 385849e3b2
4 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/src/renderer/3d/pipeline/dynamic/core/dynpip_vu1_program.cpp
+4 -5
View File
@@ -48,11 +48,10 @@ void DynPipVU1Program::addStandardBufferDataToPacket(packet2_t* packet,
packet2_utils_vu_open_unpack(packet, 0, true);
{
packet2_add_float(packet, 2048.0F); // scale
packet2_add_float(packet, 2048.0F); // scale
packet2_add_float(packet,
static_cast<float>(0xFFFFFF) / 32.0F); // scale
packet2_add_u32(packet, bag->count); // vertex count
packet2_add_float(packet, 2048.0F); // scale
packet2_add_float(packet, 2048.0F); // scale
packet2_add_float(packet, static_cast<float>(0xFFFFFF) / 32.0F); // scale
packet2_add_u32(packet, bag->count); // vertex count
packet2_utils_gs_add_prim_giftag(packet, prim, bag->count, reglist,
reglistCount, 0);
engine/src/renderer/3d/pipeline/static/core/stapip_vu1_program.cpp
+4 -5
View File
@@ -49,11 +49,10 @@ void StaPipVU1Program::addStandardBufferDataToPacket(packet2_t* packet,
packet2_utils_vu_open_unpack(packet, 0, true);
{
packet2_add_float(packet, 2048.0F); // scale
packet2_add_float(packet, 2048.0F); // scale
packet2_add_float(packet,
static_cast<float>(0xFFFFFF) / 32.0F); // scale
packet2_add_u32(packet, buffer->size); // vertex count
packet2_add_float(packet, 2048.0F); // scale
packet2_add_float(packet, 2048.0F); // scale
packet2_add_float(packet, static_cast<float>(0xFFFFFF) / 32.0F); // scale
packet2_add_u32(packet, buffer->size); // vertex count
packet2_utils_gs_add_prim_giftag(packet, prim, buffer->size, reglist,
reglistCount, 0);
engine/src/renderer/3d/renderer_3d_utility.cpp
+10 -18
View File
@@ -80,8 +80,11 @@ void Renderer3DUtility::drawLine(const Vec4& from, const Vec4& to,
packet2_update(packet, draw_prim_start(packet->next, 0, &prim, &gsColor));
for (s8 i = 0; i < thickness; i++) {
auto draw =
calcLineVertices(outputVerts.data(), inputVerts[0], inputVerts[1], i);
Vec4 scale(2048.0F + i, 2048.0F + i, static_cast<float>(0xFFFFFF) / 32.0F,
1.0F);
auto draw = calcLineVertices(outputVerts.data(), inputVerts[0],
inputVerts[1], scale);
if (!draw) {
packet2_free(packet);
@@ -126,6 +129,9 @@ void Renderer3DUtility::drawBBox(const CoreBBox& v, const Color& color) {
bool drawedSomething = false;
for (s8 i = 0; i < thickness; i++) {
Vec4 scale(2048.0F + i, 2048.0F + i, static_cast<float>(0xFFFFFF) / 32.0F,
1.0F);
for (s8 j = 0; j < stripsCount; j++) {
for (s8 k = 0; k < vertCount; k++) {
auto index1 = k;
@@ -133,7 +139,7 @@ void Renderer3DUtility::drawBBox(const CoreBBox& v, const Color& color) {
std::array<xyz_t, 2> outputVerts;
auto draw = calcLineVertices(outputVerts.data(), inputVerts[j][index1],
inputVerts[j][index2], i);
inputVerts[j][index2], scale);
if (!draw) {
continue;
@@ -274,11 +280,8 @@ Vec4 Renderer3DUtility::convertVertices(const Vec4& v, const Vec4& scale) {
return output;
}
int counter = 0; // TODO: Remove
bool Renderer3DUtility::calcLineVertices(xyz_t* outputArray, const Vec4& a,
const Vec4& b,
const u8& displayOffset) {
const Vec4& b, const Vec4& scale) {
const auto& mvp = core->renderer3D.getViewProj();
Vec4 tmpA = mvp * a;
Vec4 tmpB = mvp * b;
@@ -295,20 +298,9 @@ bool Renderer3DUtility::calcLineVertices(xyz_t* outputArray, const Vec4& a,
}
// To screen space
Vec4 scale(2048.0F + displayOffset, 2048.0F + displayOffset,
static_cast<float>(0xFFFFFF) / 32.0F, 1.0F);
auto converted1 = convertVertices(clippedVerts[0].position, scale);
auto converted2 = convertVertices(clippedVerts[1].position, scale);
// TODO1: Czemu jak to usune to nie dziala?
// TODO2: Z index tutaj i w 2D!
if (counter++ > 50) {
counter = 0;
converted1.print("Test1");
converted2.print("Test2");
}
outputArray[0].x = static_cast<u16>(ftoi4(converted1.x));
outputArray[0].y = static_cast<u16>(ftoi4(converted1.y));
outputArray[0].z = static_cast<u32>(ftoi4(converted1.z));