diff options
| author | Jason Ekstrand <[email protected]> | 2015-08-25 17:12:03 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-08-25 18:41:21 -0700 |
| commit | 9b387b5d3f4103c51079ea5298d33086af6da433 (patch) | |
| tree | 4127f2284b6b4a5746bbc01bbfc6a97305057cb4 /src/mesa/main/readpix.c | |
| parent | 5360edcb304e147341b934567f3bbf40e9d5a3b5 (diff) | |
| parent | 1d2a844e7d55645ea3d24fb589bec03695b3d2b1 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/mesa/main/readpix.c')
| -rw-r--r-- | src/mesa/main/readpix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index d826ecfc3d5..12779446c6d 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -201,7 +201,7 @@ readpixels_can_use_memcpy(const struct gl_context *ctx, GLenum format, GLenum ty /* The Mesa format must match the input format and type. */ if (!_mesa_format_matches_format_and_type(rb->Format, format, type, - packing->SwapBytes)) { + packing->SwapBytes, NULL)) { return GL_FALSE; } |