yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #1808 from Tinob/master 

Fix clip distance and viewport
This commit is contained in:
bunnei 2018-11-28 17:47:28 -05:00 committed by GitHub
parent 3fe8ab0d99 6710eb4892
commit 5a9a84994a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/video_core/engines/maxwell_3d.h
View File

@ -744,7 +744,20 @@ public:
u32 vb_element_base; u32 vb_element_base;
INSERT_PADDING_WORDS(0x38); INSERT_PADDING_WORDS(0x36);
union {
BitField<0, 1, u32> c0;
BitField<1, 1, u32> c1;
BitField<2, 1, u32> c2;
BitField<3, 1, u32> c3;
BitField<4, 1, u32> c4;
BitField<5, 1, u32> c5;
BitField<6, 1, u32> c6;
BitField<7, 1, u32> c7;
} clip_distance_enabled;
INSERT_PADDING_WORDS(0x1);
float point_size; float point_size;
@ -1208,6 +1221,7 @@ ASSERT_REG_POSITION(stencil_front_mask, 0x4E7);
ASSERT_REG_POSITION(frag_color_clamp, 0x4EA); ASSERT_REG_POSITION(frag_color_clamp, 0x4EA);
ASSERT_REG_POSITION(screen_y_control, 0x4EB); ASSERT_REG_POSITION(screen_y_control, 0x4EB);
ASSERT_REG_POSITION(vb_element_base, 0x50D); ASSERT_REG_POSITION(vb_element_base, 0x50D);
ASSERT_REG_POSITION(clip_distance_enabled, 0x544);
ASSERT_REG_POSITION(point_size, 0x546); ASSERT_REG_POSITION(point_size, 0x546);
ASSERT_REG_POSITION(zeta_enable, 0x54E); ASSERT_REG_POSITION(zeta_enable, 0x54E);
ASSERT_REG_POSITION(multisample_control, 0x54F); ASSERT_REG_POSITION(multisample_control, 0x54F);

18
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -642,6 +642,7 @@ void RasterizerOpenGL::DrawArrays() {
SyncCullMode(); SyncCullMode();
SyncPrimitiveRestart(); SyncPrimitiveRestart();
SyncScissorTest(state); SyncScissorTest(state);
SyncClipEnabled();
// Alpha Testing is synced on shaders. // Alpha Testing is synced on shaders.
SyncTransformFeedback(); SyncTransformFeedback();
SyncPointState(); SyncPointState();
@ -1006,18 +1007,11 @@ void RasterizerOpenGL::SyncViewport(OpenGLState& current_state) {
for (std::size_t i = 0; i < viewport_count; i++) { for (std::size_t i = 0; i < viewport_count; i++) {
auto& viewport = current_state.viewports[i]; auto& viewport = current_state.viewports[i];
const auto& src = regs.viewports[i]; const auto& src = regs.viewports[i];
if (regs.viewport_transform_enabled) {
const MathUtil::Rectangle<s32> viewport_rect{regs.viewport_transform[i].GetRect()}; const MathUtil::Rectangle<s32> viewport_rect{regs.viewport_transform[i].GetRect()};
viewport.x = viewport_rect.left; viewport.x = viewport_rect.left;
viewport.y = viewport_rect.bottom; viewport.y = viewport_rect.bottom;
viewport.width = viewport_rect.GetWidth(); viewport.width = viewport_rect.GetWidth();
viewport.height = viewport_rect.GetHeight(); viewport.height = viewport_rect.GetHeight();
} else {
viewport.x = src.x;
viewport.y = src.y;
viewport.width = src.width;
viewport.height = src.height;
}
viewport.depth_range_far = regs.viewports[i].depth_range_far; viewport.depth_range_far = regs.viewports[i].depth_range_far;
viewport.depth_range_near = regs.viewports[i].depth_range_near; viewport.depth_range_near = regs.viewports[i].depth_range_near;
} }
@ -1026,7 +1020,15 @@ void RasterizerOpenGL::SyncViewport(OpenGLState& current_state) {
} }
void RasterizerOpenGL::SyncClipEnabled() { void RasterizerOpenGL::SyncClipEnabled() {
UNREACHABLE(); const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs;
state.clip_distance[0] = regs.clip_distance_enabled.c0 != 0;
state.clip_distance[1] = regs.clip_distance_enabled.c1 != 0;
state.clip_distance[2] = regs.clip_distance_enabled.c2 != 0;
state.clip_distance[3] = regs.clip_distance_enabled.c3 != 0;
state.clip_distance[4] = regs.clip_distance_enabled.c4 != 0;
state.clip_distance[5] = regs.clip_distance_enabled.c5 != 0;
state.clip_distance[6] = regs.clip_distance_enabled.c6 != 0;
state.clip_distance[7] = regs.clip_distance_enabled.c7 != 0;
} }
void RasterizerOpenGL::SyncClipCoef() { void RasterizerOpenGL::SyncClipCoef() {

2
src/video_core/renderer_opengl/gl_state.h
View File

@ -190,7 +190,7 @@ public:
GLfloat clamp; GLfloat clamp;
} polygon_offset; } polygon_offset;
std::array<bool, 2> clip_distance; // GL_CLIP_DISTANCE std::array<bool, 8> clip_distance; // GL_CLIP_DISTANCE
OpenGLState(); OpenGLState();