diff options
| author | 2018-03-16 21:04:39 -0400 | |
|---|---|---|
| committer | 2018-03-16 21:04:39 -0400 | |
| commit | e453b09a61758ec94b40f5140258ad0dbbf1ef4e (patch) | |
| tree | 79c029a7b82923a6137610bb390cebac18da36ee /src | |
| parent | Merge pull request #232 from bunnei/heap-fixes (diff) | |
| parent | nvflinger: Remove superfluous buffer format check. (diff) | |
| download | yuzu-e453b09a61758ec94b40f5140258ad0dbbf1ef4e.tar.gz yuzu-e453b09a61758ec94b40f5140258ad0dbbf1ef4e.tar.xz yuzu-e453b09a61758ec94b40f5140258ad0dbbf1ef4e.zip | |
Merge pull request #238 from bunnei/fix-buffer-check
nvflinger: Remove superfluous buffer format check.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/hle/service/nvflinger/buffer_queue.cpp b/src/core/hle/service/nvflinger/buffer_queue.cpp index ff7b6b039..e2c25048b 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue.cpp | |||
| @@ -36,9 +36,7 @@ u32 BufferQueue::DequeueBuffer(u32 pixel_format, u32 width, u32 height) { | |||
| 36 | return false; | 36 | return false; |
| 37 | 37 | ||
| 38 | // Make sure that the parameters match. | 38 | // Make sure that the parameters match. |
| 39 | auto& igbp_buffer = buffer.igbp_buffer; | 39 | return buffer.igbp_buffer.width == width && buffer.igbp_buffer.height == height; |
| 40 | return igbp_buffer.format == pixel_format && igbp_buffer.width == width && | ||
| 41 | igbp_buffer.height == height; | ||
| 42 | }); | 40 | }); |
| 43 | if (itr == queue.end()) { | 41 | if (itr == queue.end()) { |
| 44 | LOG_CRITICAL(Service_NVDRV, "no free buffers for pixel_format=%d, width=%d, height=%d", | 42 | LOG_CRITICAL(Service_NVDRV, "no free buffers for pixel_format=%d, width=%d, height=%d", |