From 923bdbf48c4113326773e98c786e4405b2e1838b Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 3 May 2016 11:10:54 +0100 Subject: [PATCH] mesa_glinterop: rename MESA_GLINTEROP_INVALID_{VALUE,VERSION} MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Be more explicit what it actually does. Signed-off-by: Emil Velikov Reviewed-by: Marek Olšák Tested-by: Tom Stellard --- include/GL/mesa_glinterop.h | 2 +- src/gallium/state_trackers/dri/dri2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h index a187a121242..ff3235e958a 100644 --- a/include/GL/mesa_glinterop.h +++ b/include/GL/mesa_glinterop.h @@ -71,7 +71,7 @@ enum { MESA_GLINTEROP_OUT_OF_RESOURCES, MESA_GLINTEROP_OUT_OF_HOST_MEMORY, MESA_GLINTEROP_INVALID_OPERATION, - MESA_GLINTEROP_INVALID_VALUE, + MESA_GLINTEROP_INVALID_VERSION, MESA_GLINTEROP_INVALID_DISPLAY, MESA_GLINTEROP_INVALID_CONTEXT, MESA_GLINTEROP_INVALID_TARGET, diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index bcca2f21780..8b6af600e32 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -1469,7 +1469,7 @@ dri2_interop_query_device_info(__DRIcontext *_ctx, struct pipe_screen *screen = dri_context(_ctx)->st->pipe->screen; if (!out->version) - return MESA_GLINTEROP_INVALID_VALUE; + return MESA_GLINTEROP_INVALID_VERSION; out->pci_segment_group = screen->get_param(screen, PIPE_CAP_PCI_GROUP); out->pci_bus = screen->get_param(screen, PIPE_CAP_PCI_BUS); @@ -1498,7 +1498,7 @@ dri2_interop_export_object(__DRIcontext *_ctx, boolean success; if (!in->version || !out->version) - return MESA_GLINTEROP_INVALID_VALUE; + return MESA_GLINTEROP_INVALID_VERSION; /* Validate the target. */ switch (in->target) { -- 2.30.2