openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2025-02-18 17:09:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mesa_glinterop: use consistent naming scheme for GL interop

Browse Source 
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>
This commit is contained in:
Emil Velikov 2016-04-21 16:20:45 +01:00 committed by Emil Velikov
parent 0d31bfd71a
commit cbf29d90ba
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/GL/mesa_glinterop.h
View File

@ -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

6
src/gallium/state_trackers/dri/dri2.c
View File

@ -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;