diff options
author | Eric Engestrom <eric.engestrom@intel.com> | 2018-11-30 13:04:06 +0000 |
---|---|---|
committer | Eric Engestrom <eric.engestrom@intel.com> | 2019-01-19 11:32:54 +0000 |
commit | a911fa2977a47b290b52119a9cc314aaf18965e5 (patch) | |
tree | a181305b8a1194902335f663ccc814d441d7c122 | |
parent | 50581054c0f504beed272eb54c6b66d10de198cd (diff) |
fix macro redefinition with libdrm>=2.4.95
DRM_FORMAT_INVALID was meant to be an nonexistent format but ironically,
the name does exist now, so let's just rename it to what it really means.
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
-rw-r--r-- | tests/spec/ext_image_dma_buf_import/invalid_attributes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/spec/ext_image_dma_buf_import/invalid_attributes.c b/tests/spec/ext_image_dma_buf_import/invalid_attributes.c index e4bc78f7d..d1f34f7eb 100644 --- a/tests/spec/ext_image_dma_buf_import/invalid_attributes.c +++ b/tests/spec/ext_image_dma_buf_import/invalid_attributes.c @@ -51,7 +51,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN PIGLIT_GL_TEST_CONFIG_END -#define DRM_FORMAT_INVALID fourcc_code('F', 'O', 'O', '0') +#define DRM_FORMAT_NONEXISTENT fourcc_code('F', 'O', 'O', '0') static bool test_excess_attributes(unsigned w, unsigned h, int fd, unsigned stride, @@ -155,7 +155,7 @@ test_invalid_format(unsigned w, unsigned h, int fd, unsigned stride, EGLint attr[] = { EGL_WIDTH, w, EGL_HEIGHT, h, - EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_INVALID, + EGL_LINUX_DRM_FOURCC_EXT, DRM_FORMAT_NONEXISTENT, EGL_DMA_BUF_PLANE0_FD_EXT, fd, EGL_DMA_BUF_PLANE0_OFFSET_EXT, offset, EGL_DMA_BUF_PLANE0_PITCH_EXT, stride, |