frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor_egl: Don't call eglDestroyImageKHR directly. 

Some implementation doesn't have it.

Signed-off-by: Peng Li <peng.li@intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
Zhigang Gong 2012-01-20 11:58:34 +08:00 committed by Eric Anholt
parent 125f317d90
commit 92671e3ac8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glamor/glamor_egl.c
View File

@ -87,6 +87,7 @@ struct glamor_egl_screen_private {
struct gbm_device *gbm; struct gbm_device *gbm;
PFNEGLCREATEIMAGEKHRPROC egl_create_image_khr; PFNEGLCREATEIMAGEKHRPROC egl_create_image_khr;
PFNEGLDESTROYIMAGEKHRPROC egl_destroy_image_khr;
PFNGLEGLIMAGETARGETTEXTURE2DOESPROC egl_image_target_texture2d_oes; PFNGLEGLIMAGETARGETTEXTURE2DOESPROC egl_image_target_texture2d_oes;
struct glamor_gl_dispatch *dispatch; struct glamor_gl_dispatch *dispatch;
}; };
@ -235,7 +236,7 @@ glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap)
* a texture. we must call glFlush to make sure the * a texture. we must call glFlush to make sure the
* operation on that texture has been done.*/ * operation on that texture has been done.*/
glamor_block_handler(pixmap->drawable.pScreen); glamor_block_handler(pixmap->drawable.pScreen);
eglDestroyImageKHR(glamor_egl->display, image); glamor_egl->egl_destroy_image_khr(glamor_egl->display, image);
} }
} }
glamor_destroy_textured_pixmap(pixmap); glamor_destroy_textured_pixmap(pixmap);
@ -336,6 +337,9 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
glamor_egl->egl_create_image_khr = (PFNEGLCREATEIMAGEKHRPROC) glamor_egl->egl_create_image_khr = (PFNEGLCREATEIMAGEKHRPROC)
eglGetProcAddress("eglCreateImageKHR"); eglGetProcAddress("eglCreateImageKHR");
glamor_egl->egl_destroy_image_khr = (PFNEGLDESTROYIMAGEKHRPROC)
eglGetProcAddress("eglDestroyImageKHR");
glamor_egl->egl_image_target_texture2d_oes = glamor_egl->egl_image_target_texture2d_oes =
(PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)
eglGetProcAddress("glEGLImageTargetTexture2DOES"); eglGetProcAddress("glEGLImageTargetTexture2DOES");