diff options
| author |  bunnei | 2018-09-21 14:02:00 -0400 |
|---|---|---|
| committer |  GitHub | 2018-09-21 14:02:00 -0400 |
| commit | 4f186de0690536ab3a58c8a5746da9928e78223c (patch) | |
| tree | bc9b139f6b9f3dd4bfbc23db1f95206e7dc57d44 | |
| parent | Added support for uncompressed NSOs (#1374) (diff) | |
| parent | gl_stream_buffer: Fix use of bitwise OR instead of logical OR in Map() (diff) | |
| download | yuzu-4f186de0690536ab3a58c8a5746da9928e78223c.tar.gz yuzu-4f186de0690536ab3a58c8a5746da9928e78223c.tar.xz yuzu-4f186de0690536ab3a58c8a5746da9928e78223c.zip | |
Merge pull request #1379 from lioncash/bitwise
gl_stream_buffer: Fix use of bitwise OR instead of logical OR in Map()
| -rw-r--r-- | src/video_core/renderer_opengl/gl_stream_buffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_stream_buffer.cpp b/src/video_core/renderer_opengl/gl_stream_buffer.cpp index 664f3ca20..e409228cc 100644 --- a/src/video_core/renderer_opengl/gl_stream_buffer.cpp +++ b/src/video_core/renderer_opengl/gl_stream_buffer.cpp | |||
| @@ -74,7 +74,7 @@ std::tuple<u8*, GLintptr, bool> OGLStreamBuffer::Map(GLsizeiptr size, GLintptr a | |||
| 74 | } | 74 | } |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | if (invalidate | !persistent) { | 77 | if (invalidate || !persistent) { |
| 78 | GLbitfield flags = GL_MAP_WRITE_BIT | (persistent ? GL_MAP_PERSISTENT_BIT : 0) | | 78 | GLbitfield flags = GL_MAP_WRITE_BIT | (persistent ? GL_MAP_PERSISTENT_BIT : 0) | |
| 79 | (coherent ? GL_MAP_COHERENT_BIT : GL_MAP_FLUSH_EXPLICIT_BIT) | | 79 | (coherent ? GL_MAP_COHERENT_BIT : GL_MAP_FLUSH_EXPLICIT_BIT) | |
| 80 | (invalidate ? GL_MAP_INVALIDATE_BUFFER_BIT : GL_MAP_UNSYNCHRONIZED_BIT); | 80 | (invalidate ? GL_MAP_INVALIDATE_BUFFER_BIT : GL_MAP_UNSYNCHRONIZED_BIT); |