N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SwRasterizer: implement custom clip plane

Browse source
This commit is contained in:
wwylele 2017-08-22 09:49:26 +03:00
parent 61442d6afb
commit ea51a3af26
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/video_core/regs_rasterizer.h
View file

@ -5,10 +5,10 @@
#pragma once #pragma once
#include <array> #include <array>
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "video_core/pica_types.h"
namespace Pica { namespace Pica {
@ -31,7 +31,17 @@ struct RasterizerRegs {
BitField<0, 24, u32> viewport_size_y; BitField<0, 24, u32> viewport_size_y;
INSERT_PADDING_WORDS(0x9); INSERT_PADDING_WORDS(0x3);
BitField<0, 1, u32> clip_enable;
BitField<0, 24, u32> clip_coef[4]; // float24
Math::Vec4<float24> GetClipCoef() const {
return {float24::FromRaw(clip_coef[0]), float24::FromRaw(clip_coef[1]),
float24::FromRaw(clip_coef[2]), float24::FromRaw(clip_coef[3])};
}
INSERT_PADDING_WORDS(0x1);
BitField<0, 24, u32> viewport_depth_range; // float24 BitField<0, 24, u32> viewport_depth_range; // float24
BitField<0, 24, u32> viewport_depth_near_plane; // float24 BitField<0, 24, u32> viewport_depth_near_plane; // float24

15
src/video_core/swrasterizer/clipper.cpp
View file

@ -127,8 +127,7 @@ void ProcessTriangle(const OutputVertex& v0, const OutputVertex& v1, const Outpu
// Simple implementation of the Sutherland-Hodgman clipping algorithm. // Simple implementation of the Sutherland-Hodgman clipping algorithm.
// TODO: Make this less inefficient (currently lots of useless buffering overhead happens here) // TODO: Make this less inefficient (currently lots of useless buffering overhead happens here)
for (auto edge : clipping_edges) { auto Clip = [&](const ClippingEdge& edge) {
std::swap(input_list, output_list); std::swap(input_list, output_list);
output_list->clear(); output_list->clear();
@ -147,12 +146,24 @@ void ProcessTriangle(const OutputVertex& v0, const OutputVertex& v1, const Outpu
} }
reference_vertex = &vertex; reference_vertex = &vertex;
} }
};
for (auto edge : clipping_edges) {
Clip(edge);
// Need to have at least a full triangle to continue... // Need to have at least a full triangle to continue...
if (output_list->size() < 3) if (output_list->size() < 3)
return; return;
} }
if (g_state.regs.rasterizer.clip_enable) {
ClippingEdge custom_edge{-g_state.regs.rasterizer.GetClipCoef()};
Clip(custom_edge);
if (output_list->size() < 3)
return;
}
InitScreenCoordinates((*output_list)[0]); InitScreenCoordinates((*output_list)[0]);
InitScreenCoordinates((*output_list)[1]); InitScreenCoordinates((*output_list)[1]);