From 1be7b5271ec1d08b6929a88dd811754d33d149de Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 6 Nov 2010 06:15:21 +0100 Subject: Complete removal of NV KD and OMX started with 46f17013c7cd59d551371edb2c1a4a57f8cbd84f (code dependencies) This currently removes KD fullscreen for NV devices and the whole OMX NV stream/file type detection, which renders the OMX hack useless. However, updated EGL sync (NV proprietary) to EGL_KHR_reusable_sync and EGL_KHR_fence_sync. --- src/jogl/native/openmax/omx_tool.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/jogl/native/openmax/omx_tool.h') diff --git a/src/jogl/native/openmax/omx_tool.h b/src/jogl/native/openmax/omx_tool.h index 1a0adf0a0..dbc375dd7 100644 --- a/src/jogl/native/openmax/omx_tool.h +++ b/src/jogl/native/openmax/omx_tool.h @@ -1,3 +1,6 @@ +/** + * Uses the EGL Extensions: EGL_KHR_reusable_sync and EGL_KHR_fence_sync + */ #ifndef _OMX_TOOL_H #define _OMX_TOOL_H @@ -27,13 +30,12 @@ #endif #include +#include #include -#include -#include -#include -#include + #include #include +#include #include #include @@ -80,6 +82,7 @@ typedef enum typedef struct { + EGLDisplay dpy; OMX_VERSIONTYPE version; OMX_HANDLETYPE comp[OMXAV_H_NUMBER]; OMX_HANDLETYPE endComponent; @@ -138,7 +141,7 @@ KDint OMXToolBasicAV_SetState(OMXToolBasicAV_t * pOMXAV, OMX_STATETYPE state, KD // // User related functionality, mutex managed // -OMXToolBasicAV_t * OMXToolBasicAV_CreateInstance(); // #1 +OMXToolBasicAV_t * OMXToolBasicAV_CreateInstance(EGLDisplay dpy); // #1 void OMXToolBasicAV_SetStream(OMXToolBasicAV_t * pOMXAV, int vBufferNum, const KDchar * stream); // #2 void OMXToolBasicAV_SetStreamEGLImageTexture2D(OMXToolBasicAV_t * pOMXAV, KDint i, GLuint tex, EGLImageKHR image, EGLSyncKHR sync); // #3 void OMXToolBasicAV_ActivateStream(OMXToolBasicAV_t * pOMXAV); // #4 -- cgit v1.2.3