From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 21 Apr 2016 15:36:01 +0000 (+0100)
Subject: mesa_glinterop: use generic variable types for the GL interop
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e726144f9158b8acd4487d9a1beceaa1be85614;p=mesa.git

mesa_glinterop: use generic variable types for the GL interop

Thus we can preserve the ABI, while avoiding the inclusion of some/all
of the following:

  EGL/egl.h
  GL/gl.h
  GL/glcorearb.h
  GLES/gl.h
  GLES2/gl2.h
  GLES3/gl3.h
  GLES3/gl31.h

This will allow us to build/use it alongside any combination of APIs.

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

diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h
index 087764e2a8a..05435744cbc 100644
--- a/include/GL/mesa_glinterop.h
+++ b/include/GL/mesa_glinterop.h
@@ -141,16 +141,16 @@ typedef struct _mesa_glinterop_export_in {
     * - GL_RENDERBUFFER
     * - GL_ARRAY_BUFFER
     */
-   GLenum target;
+   unsigned target;
 
    /* If target is GL_ARRAY_BUFFER, it's a buffer object.
     * If target is GL_RENDERBUFFER, it's a renderbuffer object.
     * If target is GL_TEXTURE_*, it's a texture object.
     */
-   GLuint obj;
+   unsigned obj;
 
    /* Mipmap level. Ignored for non-texture objects. */
-   GLuint miplevel;
+   unsigned miplevel;
 
    /* One of MESA_GLINTEROP_ACCESS_* flags. This describes how the exported
     * object is going to be used.
@@ -193,7 +193,7 @@ typedef struct _mesa_glinterop_export_out {
     * format specified by glTexStorage, glTexImage, or glRenderbufferStorage
     * will be returned.
     */
-   GLenum internal_format;
+   unsigned internal_format;
 
    /* Buffer offset and size for GL_ARRAY_BUFFER and GL_TEXTURE_BUFFER.
     * This allows interop with suballocations (a buffer allocated within
@@ -208,10 +208,10 @@ typedef struct _mesa_glinterop_export_out {
    /* Parameters specified by glTextureView. If the object is not a texture
     * view, default parameters covering the whole texture will be returned.
     */
-   GLuint view_minlevel;
-   GLuint view_numlevels;
-   GLuint view_minlayer;
-   GLuint view_numlayers;
+   unsigned view_minlevel;
+   unsigned view_numlevels;
+   unsigned view_minlayer;
+   unsigned view_numlayers;
 
    /* The number of bytes written to out_driver_data. */
    uint32_t out_driver_data_written;