summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/dri
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2016-04-21 16:20:45 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-05-24 23:02:08 +0100
commitcbf29d90bae9ba415b8158afc3a06a1360ec0bc4 (patch)
tree2ec9073c82c8dfc008a35e190c18c894d6a545e3 /src/gallium/state_trackers/dri
parent0d31bfd71aa44aa34f3cfa8711c4070c3fb1e26a (diff)
downloadexternal_mesa3d-cbf29d90bae9ba415b8158afc3a06a1360ec0bc4.zip
external_mesa3d-cbf29d90bae9ba415b8158afc3a06a1360ec0bc4.tar.gz
external_mesa3d-cbf29d90bae9ba415b8158afc3a06a1360ec0bc4.tar.bz2
mesa_glinterop: use consistent naming scheme for GL interop
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Tested-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'src/gallium/state_trackers/dri')
-rw-r--r--src/gallium/state_trackers/dri/dri2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
index b07cfcb..7f0db35 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;