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

Jump to bottom

rsx: More regression fixes #13240

Merged
merged 2 commits into from Jan 16, 2023
Merged

rsx: More regression fixes #13240

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
55cf7de
rsx: Allow vertex fetch from uninitialized register
kd-11 Jan 16, 2023
8f4e7c8
rsx: Fix inadvertent signal override for MSAA
kd-11 Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions rpcs3/Emu/RSX/Program/GLSLCommon.cpp
View file
Open in desktop
Expand Up @@ -289,10 +289,10 @@ namespace glsl

"vec4 fetch_attribute(const in attribute_desc desc, const in int vertex_id, usamplerBuffer input_stream)\n"
"{\n"
" const int elem_size_table[] = { 2, 4, 2, 1, 2, 4, 1 };\n"
" const float scaling_table[] = { 32767.5, 1., 1., 255., 1., 32767., 1. };\n"
" const int elem_size = elem_size_table[desc.type - 1];\n"
" const vec4 scale = scaling_table[desc.type - 1].xxxx;\n\n"
" const int elem_size_table[] = { 0, 2, 4, 2, 1, 2, 4, 1 };\n"
" const float scaling_table[] = { 1., 32767.5, 1., 1., 255., 1., 32767., 1. };\n"
" const int elem_size = elem_size_table[desc.type];\n"
" const vec4 scale = scaling_table[desc.type].xxxx;\n\n"

" uvec4 tmp, result = uvec4(0u);\n"
" vec4 ret;\n"
Expand Down
3 changes: 1 addition & 2 deletions rpcs3/Emu/RSX/rsx_methods.cpp
View file
Open in desktop
Expand Up @@ -2461,7 +2461,7 @@ namespace rsx
state_signals[NV4097_SET_ALPHA_FUNC] = rsx::fragment_state_dirty;
state_signals[NV4097_SET_ALPHA_REF] = rsx::fragment_state_dirty;
state_signals[NV4097_SET_ALPHA_TEST_ENABLE] = rsx::fragment_state_dirty;
state_signals[NV4097_SET_ANTI_ALIASING_CONTROL] = rsx::fragment_state_dirty;
state_signals[NV4097_SET_ANTI_ALIASING_CONTROL] = rsx::fragment_state_dirty | rsx::pipeline_config_dirty;
state_signals[NV4097_SET_SHADER_PACKER] = rsx::fragment_state_dirty;
state_signals[NV4097_SET_SHADER_WINDOW] = rsx::fragment_state_dirty;
state_signals[NV4097_SET_FOG_MODE] = rsx::fragment_state_dirty;
Expand Down Expand Up @@ -2525,7 +2525,6 @@ namespace rsx
state_signals[NV4097_SET_BLEND_ENABLE_MRT] = rsx::pipeline_config_dirty;
state_signals[NV4097_SET_STENCIL_FUNC] = rsx::pipeline_config_dirty;
state_signals[NV4097_SET_BACK_STENCIL_FUNC] = rsx::pipeline_config_dirty;
state_signals[NV4097_SET_ANTI_ALIASING_CONTROL] = rsx::pipeline_config_dirty;
state_signals[NV4097_SET_RESTART_INDEX_ENABLE] = rsx::pipeline_config_dirty;
}

Expand Down