From cbf29d90bae9ba415b8158afc3a06a1360ec0bc4 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 21 Apr 2016 16:20:45 +0100 Subject: [PATCH] mesa_glinterop: use consistent naming scheme for GL interop MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h index 814064d8530..087764e2a8a 100644 --- a/include/GL/mesa_glinterop.h +++ b/include/GL/mesa_glinterop.h @@ -193,7 +193,7 @@ typedef struct _mesa_glinterop_export_out { * format specified by glTexStorage, glTexImage, or glRenderbufferStorage * will be returned. */ - GLenum internalformat; + GLenum internal_format; /* Buffer offset and size for GL_ARRAY_BUFFER and GL_TEXTURE_BUFFER. * This allows interop with suballocations (a buffer allocated within diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index b07cfcb3064..7f0db351c87 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -1603,7 +1603,7 @@ dri2_interop_export_object(__DRIcontext *_ctx, return MESA_GLINTEROP_OUT_OF_RESOURCES; } - out->internalformat = rb->InternalFormat; + out->internal_format = rb->InternalFormat; out->view_minlevel = 0; out->view_numlevels = 1; out->view_minlayer = 0; @@ -1659,14 +1659,14 @@ dri2_interop_export_object(__DRIcontext *_ctx, } if (target == GL_TEXTURE_BUFFER) { - out->internalformat = obj->BufferObjectFormat; + out->internal_format = obj->BufferObjectFormat; out->buf_offset = obj->BufferOffset; out->buf_size = obj->BufferSize == -1 ? obj->BufferObject->Size : obj->BufferSize; obj->BufferObject->UsageHistory |= USAGE_DISABLE_MINMAX_CACHE; } else { - out->internalformat = obj->Image[0][0]->InternalFormat; + out->internal_format = obj->Image[0][0]->InternalFormat; out->view_minlevel = obj->MinLevel; out->view_numlevels = obj->NumLevels; out->view_minlayer = obj->MinLayer; -- 2.11.0