summaryrefslogtreecommitdiff
path: root/src/lib/evas/Evas_GL.h
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-07-18 15:09:19 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-07-18 15:09:19 +0900
commitf18747e6dd6e406a2e79c80562ab830a1da40716 (patch)
treee6e1db9d014015f85995c9cb04a6a88f4080aa32 /src/lib/evas/Evas_GL.h
parent5faf536f51621c815196598ac26b8cc39d5e8f56 (diff)
Evas GL: Use [u]int64_t directly in all APIs
This removes the need for khronos_[u]int64_t as well as the special typdef EvasGL[u]int64. Hopefully this should work on all platforms (note: [u]int64_t is used in Eina APIs, so it is already required for EFL apps). Fixes T3200
Diffstat (limited to 'src/lib/evas/Evas_GL.h')
-rw-r--r--src/lib/evas/Evas_GL.h25
1 files changed, 8 insertions, 17 deletions
diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h
index fafa806ae5..ddc418a869 100644
--- a/src/lib/evas/Evas_GL.h
+++ b/src/lib/evas/Evas_GL.h
@@ -889,15 +889,6 @@ EAPI Evas_GL *evas_gl_current_evas_gl_get (Evas_GL_Context **con
889 * Evas_GL.h as these will conflict. 889 * Evas_GL.h as these will conflict.
890 *-----------------------------------------------------------------------*/ 890 *-----------------------------------------------------------------------*/
891 891
892#ifndef KHRONOS_SUPPORT_INT64
893typedef unsigned long long khronos_uint64_t;
894typedef signed long long khronos_int64_t;
895#endif
896
897// Due to build conflicts on various platforms, we can't use GL[u]int64 directly
898typedef khronos_int64_t EvasGLint64;
899typedef khronos_uint64_t EvasGLuint64;
900
901#if !defined(__gl2_h_) 892#if !defined(__gl2_h_)
902# define __gl2_h_ 893# define __gl2_h_
903 894
@@ -5262,9 +5253,9 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
5262 GLsync (*glFenceSyncAPPLE) (GLenum condition, GLbitfield flags); 5253 GLsync (*glFenceSyncAPPLE) (GLenum condition, GLbitfield flags);
5263 GLboolean (*glIsSyncAPPLE) (GLsync sync); 5254 GLboolean (*glIsSyncAPPLE) (GLsync sync);
5264 void (*glDeleteSyncAPPLE) (GLsync sync); 5255 void (*glDeleteSyncAPPLE) (GLsync sync);
5265 GLenum (*glClientWaitSyncAPPLE) (GLsync sync, GLbitfield flags, EvasGLuint64 timeout); 5256 GLenum (*glClientWaitSyncAPPLE) (GLsync sync, GLbitfield flags, uint64_t timeout);
5266 void (*glWaitSyncAPPLE) (GLsync sync, GLbitfield flags, EvasGLuint64 timeout); 5257 void (*glWaitSyncAPPLE) (GLsync sync, GLbitfield flags, uint64_t timeout);
5267 void (*glGetInteger64vAPPLE) (GLenum pname, EvasGLint64 *params); 5258 void (*glGetInteger64vAPPLE) (GLenum pname, int64_t *params);
5268 void (*glGetSyncivAPPLE) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); 5259 void (*glGetSyncivAPPLE) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
5269 5260
5270 /* GL_EXT_map_buffer_range */ 5261 /* GL_EXT_map_buffer_range */
@@ -5458,7 +5449,7 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
5458 void (*glClearBufferfv) (GLenum buffer, GLint drawBuffer, const GLfloat * value); 5449 void (*glClearBufferfv) (GLenum buffer, GLint drawBuffer, const GLfloat * value);
5459 void (*glClearBufferiv) (GLenum buffer, GLint drawBuffer, const GLint * value); 5450 void (*glClearBufferiv) (GLenum buffer, GLint drawBuffer, const GLint * value);
5460 void (*glClearBufferuiv) (GLenum buffer, GLint drawBuffer, const GLuint * value); 5451 void (*glClearBufferuiv) (GLenum buffer, GLint drawBuffer, const GLuint * value);
5461 GLenum (*glClientWaitSync) (GLsync sync, GLbitfield flags, EvasGLuint64 timeout); 5452 GLenum (*glClientWaitSync) (GLsync sync, GLbitfield flags, uint64_t timeout);
5462 void (*glCompressedTexImage3D) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); 5453 void (*glCompressedTexImage3D) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data);
5463 void (*glCompressedTexSubImage3D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); 5454 void (*glCompressedTexSubImage3D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data);
5464 void (*glCopyBufferSubData) (GLenum readtarget, GLenum writetarget, GLintptr readoffset, GLintptr writeoffset, GLsizeiptr size); 5455 void (*glCopyBufferSubData) (GLenum readtarget, GLenum writetarget, GLintptr readoffset, GLintptr writeoffset, GLsizeiptr size);
@@ -5484,11 +5475,11 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
5484 void (*glGetActiveUniformBlockiv) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params); 5475 void (*glGetActiveUniformBlockiv) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
5485 void (*glGetActiveUniformBlockName) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); 5476 void (*glGetActiveUniformBlockName) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
5486 void (*glGetActiveUniformsiv) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); 5477 void (*glGetActiveUniformsiv) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
5487 void (*glGetBufferParameteri64v) (GLenum target, GLenum value, EvasGLint64 * data); 5478 void (*glGetBufferParameteri64v) (GLenum target, GLenum value, int64_t * data);
5488 void (*glGetBufferPointerv) (GLenum target, GLenum pname, GLvoid ** params); 5479 void (*glGetBufferPointerv) (GLenum target, GLenum pname, GLvoid ** params);
5489 GLint (*glGetFragDataLocation) (GLuint program, const char * name); 5480 GLint (*glGetFragDataLocation) (GLuint program, const char * name);
5490 void (*glGetInteger64i_v) (GLenum target, GLuint index, EvasGLint64 * data); 5481 void (*glGetInteger64i_v) (GLenum target, GLuint index, int64_t * data);
5491 void (*glGetInteger64v) (GLenum pname, EvasGLint64 * data); 5482 void (*glGetInteger64v) (GLenum pname, int64_t * data);
5492 void (*glGetIntegeri_v) (GLenum target, GLuint index, GLint * data); 5483 void (*glGetIntegeri_v) (GLenum target, GLuint index, GLint * data);
5493 void (*glGetInternalformativ) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params); 5484 void (*glGetInternalformativ) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
5494 void (*glGetProgramBinary) (GLuint program, GLsizei bufsize, GLsizei *length, GLenum *binaryFormat, void *binary); 5485 void (*glGetProgramBinary) (GLuint program, GLsizei bufsize, GLsizei *length, GLenum *binaryFormat, void *binary);
@@ -5549,7 +5540,7 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
5549 void (*glVertexAttribI4ui) (GLuint index, GLuint v0, GLuint v1, GLuint v2, GLuint v3); 5540 void (*glVertexAttribI4ui) (GLuint index, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
5550 void (*glVertexAttribI4uiv) (GLuint index, const GLuint *v); 5541 void (*glVertexAttribI4uiv) (GLuint index, const GLuint *v);
5551 void (*glVertexAttribIPointer) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); 5542 void (*glVertexAttribIPointer) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
5552 void (*glWaitSync) (GLsync sync, GLbitfield flags, EvasGLuint64 timeout); 5543 void (*glWaitSync) (GLsync sync, GLbitfield flags, uint64_t timeout);
5553 /** @} */ 5544 /** @} */
5554 /** 5545 /**
5555 * @anchor gles3.1 5546 * @anchor gles3.1