Turn on building test_gl in travis (#804)

* Turn on building test_gl in travis

* Install packages only on native Linux

* Build test_gl use variable

* Travis -  skip OSX system

* Fix test_gl build errors

* Fix test_gl build errors - cast to uintptr_t

* Fix redefinition build issues in travis Xenial build env
This commit is contained in:
Grzegorz Wawiorko
2020-06-21 11:10:24 +02:00
committed by GitHub
parent 164b5ef5cf
commit 79d771ec47
3 changed files with 11 additions and 3 deletions

View File

@@ -74,7 +74,7 @@ static void InitSyncFns( void )
glGetInteger64vFunc = (glGetInteger64vPtr)glutGetProcAddress( "glGetInteger64v" );
glGetSyncivFunc = (glGetSyncivPtr)glutGetProcAddress( "glGetSynciv" );
}
#ifndef GL_ARB_sync
#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111
#define GL_OBJECT_TYPE 0x9112
@@ -97,6 +97,7 @@ static void InitSyncFns( void )
#define GL_TIMEOUT_EXPIRED 0x911B
#define GL_CONDITION_SATISFIED 0x911C
#define GL_WAIT_FAILED 0x911D
#endif
#define USING_ARB_sync 1
#endif
@@ -285,7 +286,7 @@ public:
virtual void * IRun( void )
{
cl_int error = run_cl_kernel( mKernel, mQueue, mStream0, mStream1, mRowIdx, mFenceEvent, mNumThreads );
return (void *)error;
return (void *)(uintptr_t)error;
}
};

View File

@@ -19,7 +19,7 @@
using namespace std;
typedef struct image_kernel_data
struct image_kernel_data
{
cl_int width;
cl_int height;