Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / glx / applegl_glx.c

diff --git a/src/glx/applegl_glx.c b/src/glx/applegl_glx.c
index c3597cee7659b3a9541a134c9db35378dc4a5e3e..c086e5146a84f1f3d2ad77d1ba772c89e19fb11a 100644 (file)
--- a/src/glx/applegl_glx.c
+++ b/src/glx/applegl_glx.c
@@ -37,9 +37,9 @@
 #include <dlfcn.h>
 
 #include "glxclient.h"
-#include "apple_glx_context.h"
-#include "apple_glx.h"
-#include "apple_cgl.h"
+#include "apple/apple_glx_context.h"
+#include "apple/apple_glx.h"
+#include "apple/apple_cgl.h"
 #include "glx_error.h"
 
 static void
@@ -109,15 +109,15 @@ applegl_get_proc_address(const char *symbol)
 }
 
 static const struct glx_context_vtable applegl_context_vtable = {
-   applegl_destroy_context,
-   applegl_bind_context,
-   applegl_unbind_context,
-   applegl_wait_gl,
-   applegl_wait_x,
-   DRI_glXUseXFont,
-   NULL, /* bind_tex_image, */
-   NULL, /* release_tex_image, */
-   applegl_get_proc_address,
+   .destroy             = applegl_destroy_context,
+   .bind                = applegl_bind_context,
+   .unbind              = applegl_unbind_context,
+   .wait_gl             = applegl_wait_gl,
+   .wait_x              = applegl_wait_x,
+   .use_x_font          = DRI_glXUseXFont,
+   .bind_tex_image      = NULL,
+   .release_tex_image   = NULL,
+   .get_proc_address    = applegl_get_proc_address,
 };
 
 struct glx_context *
@@ -164,8 +164,11 @@ applegl_create_context(struct glx_screen *psc,
    return gc;
 }
 
-struct glx_screen_vtable applegl_screen_vtable = {
-   applegl_create_context
+static const struct glx_screen_vtable applegl_screen_vtable = {
+   .create_context         = applegl_create_context,
+   .create_context_attribs = NULL,
+   .query_renderer_integer = NULL,
+   .query_renderer_string  = NULL,
 };
 
 _X_HIDDEN struct glx_screen *
@@ -173,11 +176,10 @@ applegl_create_screen(int screen, struct glx_display * priv)
 {
    struct glx_screen *psc;
 
-   psc = malloc(sizeof *psc);
+   psc = calloc(1, sizeof *psc);
    if (psc == NULL)
       return NULL;
 
-   memset(psc, 0, sizeof *psc);
    glx_screen_init(psc, screen, priv);
    psc->vtable = &applegl_screen_vtable;