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

gl: Fix RTT clamp mode; Fix vertex winding for emulated QUAD_STRIP triangles #1619

Merged
merged 2 commits into from
Mar 24, 2016
Merged

gl: Fix RTT clamp mode; Fix vertex winding for emulated QUAD_STRIP triangles #1619

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
a120414
Set render target textures to clamp to border by default
kd-11 Mar 23, 2016
0327e76
Fix quad strip triangle winding
kd-11 Mar 23, 2016
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
4 changes: 2 additions & 2 deletions rpcs3/Emu/RSX/Common/BufferUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@ void write_index_array_for_non_indexed_non_native_primitive_to_buffer(char* dst,
typedDst[6 * i + 2] = 2 * i + 2 + first;
// Second triangle
typedDst[6 * i + 3] = 2 * i + 2 + first;
typedDst[6 * i + 4] = 2 * i + 3 + first;
typedDst[6 * i + 5] = 2 * i + 1 + first;
typedDst[6 * i + 4] = 2 * i + 1 + first;
typedDst[6 * i + 5] = 2 * i + 3 + first;
}
return;
case rsx::primitive_type::points:
Expand Down
2 changes: 2 additions & 0 deletions rpcs3/Emu/RSX/GL/gl_render_targets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ struct gl_render_target_traits
.type(format.type)
.format(format.format)
.swizzle(format.swizzle.r, format.swizzle.g, format.swizzle.b, format.swizzle.a)
.wrap(gl::texture::wrap::clamp_to_border, gl::texture::wrap::clamp_to_border, gl::texture::wrap::clamp_to_border)
.apply();

__glcheck result->pixel_pack_settings().swap_bytes(format.swap_bytes).aligment(1);
Expand All @@ -120,6 +121,7 @@ struct gl_render_target_traits
.type(format.type)
.format(format.format)
.internal_format(format.internal_format)
.wrap(gl::texture::wrap::clamp_to_border, gl::texture::wrap::clamp_to_border, gl::texture::wrap::clamp_to_border)
.apply();

__glcheck result->pixel_pack_settings().aligment(1);
Expand Down