projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable GLES 3.0 by default.
[platform/core/uifw/dali-adaptor.git]
/
adaptors
/
common
/
gl
/
egl-image-extensions.cpp
diff --git
a/adaptors/common/gl/egl-image-extensions.cpp
b/adaptors/common/gl/egl-image-extensions.cpp
index
4792522
..
cc00800
100644
(file)
--- a/
adaptors/common/gl/egl-image-extensions.cpp
+++ b/
adaptors/common/gl/egl-image-extensions.cpp
@@
-22,8
+22,6
@@
// EXTERNAL INCLUDES
#if DALI_GLES_VERSION >= 30
#include <GLES3/gl3.h>
// EXTERNAL INCLUDES
#if DALI_GLES_VERSION >= 30
#include <GLES3/gl3.h>
-#include <GLES3/gl3ext.h>
-
#else
#include <GLES2/gl2.h>
#endif // DALI_GLES_VERSION >= 30
#else
#include <GLES2/gl2.h>
#endif // DALI_GLES_VERSION >= 30
@@
-87,6
+85,9
@@
void* EglImageExtensions::CreateImageKHR(EGLClientBuffer clientBuffer)
EGL_NONE
};
EGL_NONE
};
+// EGL constants use C casts
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
EGLImageKHR eglImage = eglCreateImageKHRProc( mEglImplementation->GetDisplay(),
EGL_NO_CONTEXT,
EGL_NATIVE_PIXMAP_KHR,
EGLImageKHR eglImage = eglCreateImageKHRProc( mEglImplementation->GetDisplay(),
EGL_NO_CONTEXT,
EGL_NATIVE_PIXMAP_KHR,
@@
-138,6
+139,7
@@
void* EglImageExtensions::CreateImageKHR(EGLClientBuffer clientBuffer)
}
}
}
}
}
}
+#pragma GCC diagnostic pop
return eglImage;
}
return eglImage;
}