From fce55c7bb3dfc9c23c2743fdb85e8525ed69dea2 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 16 Mar 2010 17:23:39 -0700 Subject: [PATCH] opengl 3.2; EXT_geometry_shader4 => ARB_geometry_shader4 --- basis/opengl/gl/gl.factor | 122 +++++++++++++++++++++++++++++------- basis/opengl/gl3/gl3.factor | 81 ++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 22 deletions(-) diff --git a/basis/opengl/gl/gl.factor b/basis/opengl/gl/gl.factor index 58039558d7..599721fb5e 100644 --- a/basis/opengl/gl/gl.factor +++ b/basis/opengl/gl/gl.factor @@ -22,6 +22,9 @@ TYPEDEF: float GLfloat TYPEDEF: float GLclampf TYPEDEF: double GLdouble TYPEDEF: double GLclampd +TYPEDEF: longlong GLint64 +TYPEDEF: ulonglong GLuint64 +TYPEDEF: void* GLsync C-TYPE: GLvoid TYPEDEF: c-string[ascii] GLstring @@ -2167,31 +2170,106 @@ GL-FUNCTION: void glUniformBlockBinding { } ( GLuint buffer, GLuint uniformBlock GL-FUNCTION: void glCopyBufferSubData { glCopyBufferSubDataEXT } ( GLenum readtarget, GLenum writetarget, GLintptr readoffset, GLintptr writeoffset, GLsizeiptr size ) ; -! GL_EXT_geometry_shader4 +! OpenGL 3.2 + +CONSTANT: GL_CONTEXT_CORE_PROFILE_BIT HEX: 00000001 +CONSTANT: GL_CONTEXT_COMPATIBILITY_PROFILE_BIT HEX: 00000002 +CONSTANT: GL_LINES_ADJACENCY HEX: 000A +CONSTANT: GL_LINE_STRIP_ADJACENCY HEX: 000B +CONSTANT: GL_TRIANGLES_ADJACENCY HEX: 000C +CONSTANT: GL_TRIANGLE_STRIP_ADJACENCY HEX: 000D +CONSTANT: GL_PROGRAM_POINT_SIZE HEX: 8642 +CONSTANT: GL_GEOMETRY_VERTICES_OUT HEX: 8916 +CONSTANT: GL_GEOMETRY_INPUT_TYPE HEX: 8917 +CONSTANT: GL_GEOMETRY_OUTPUT_TYPE HEX: 8918 +CONSTANT: GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS HEX: 8C29 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_LAYERED HEX: 8DA7 +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS HEX: 8DA8 +CONSTANT: GL_GEOMETRY_SHADER HEX: 8DD9 +CONSTANT: GL_MAX_GEOMETRY_UNIFORM_COMPONENTS HEX: 8DDF +CONSTANT: GL_MAX_GEOMETRY_OUTPUT_VERTICES HEX: 8DE0 +CONSTANT: GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS HEX: 8DE1 +CONSTANT: GL_MAX_VERTEX_OUTPUT_COMPONENTS HEX: 9122 +CONSTANT: GL_MAX_GEOMETRY_INPUT_COMPONENTS HEX: 9123 +CONSTANT: GL_MAX_GEOMETRY_OUTPUT_COMPONENTS HEX: 9124 +CONSTANT: GL_MAX_FRAGMENT_INPUT_COMPONENTS HEX: 9125 +CONSTANT: GL_CONTEXT_PROFILE_MASK HEX: 9126 +CONSTANT: GL_MAX_SERVER_WAIT_TIMEOUT HEX: 9111 +CONSTANT: GL_OBJECT_TYPE HEX: 9112 +CONSTANT: GL_SYNC_CONDITION HEX: 9113 +CONSTANT: GL_SYNC_STATUS HEX: 9114 +CONSTANT: GL_SYNC_FLAGS HEX: 9115 +CONSTANT: GL_SYNC_FENCE HEX: 9116 +CONSTANT: GL_SYNC_GPU_COMMANDS_COMPLETE HEX: 9117 +CONSTANT: GL_UNSIGNALED HEX: 9118 +CONSTANT: GL_SIGNALED HEX: 9119 +CONSTANT: GL_ALREADY_SIGNALED HEX: 911A +CONSTANT: GL_TIMEOUT_EXPIRED HEX: 911B +CONSTANT: GL_CONDITION_SATISFIED HEX: 911C +CONSTANT: GL_WAIT_FAILED HEX: 911D +CONSTANT: GL_SYNC_FLUSH_COMMANDS_BIT HEX: 00000001 +CONSTANT: GL_TIMEOUT_IGNORED HEX: FFFF,FFFF,FFFF,FFFF +CONSTANT: GL_SAMPLE_POSITION HEX: 8E50 +CONSTANT: GL_SAMPLE_MASK HEX: 8E51 +CONSTANT: GL_SAMPLE_MASK_VALUE HEX: 8E52 +CONSTANT: GL_MAX_SAMPLE_MASK_WORDS HEX: 8E59 +CONSTANT: GL_TEXTURE_2D_MULTISAMPLE HEX: 9100 +CONSTANT: GL_PROXY_TEXTURE_2D_MULTISAMPLE HEX: 9101 +CONSTANT: GL_TEXTURE_2D_MULTISAMPLE_ARRAY HEX: 9102 +CONSTANT: GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY HEX: 9103 +CONSTANT: GL_TEXTURE_BINDING_2D_MULTISAMPLE HEX: 9104 +CONSTANT: GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY HEX: 9105 +CONSTANT: GL_TEXTURE_SAMPLES HEX: 9106 +CONSTANT: GL_TEXTURE_FIXED_SAMPLE_LOCATIONS HEX: 9107 +CONSTANT: GL_SAMPLER_2D_MULTISAMPLE HEX: 9108 +CONSTANT: GL_INT_SAMPLER_2D_MULTISAMPLE HEX: 9109 +CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE HEX: 910A +CONSTANT: GL_SAMPLER_2D_MULTISAMPLE_ARRAY HEX: 910B +CONSTANT: GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY HEX: 910C +CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY HEX: 910D +CONSTANT: GL_MAX_COLOR_TEXTURE_SAMPLES HEX: 910E +CONSTANT: GL_MAX_DEPTH_TEXTURE_SAMPLES HEX: 910F +CONSTANT: GL_MAX_INTEGER_SAMPLES HEX: 9110 +CONSTANT: GL_DEPTH_CLAMP HEX: 864F +CONSTANT: GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION HEX: 8E4C +CONSTANT: GL_FIRST_VERTEX_CONVENTION HEX: 8E4D +CONSTANT: GL_LAST_VERTEX_CONVENTION HEX: 8E4E +CONSTANT: GL_PROVOKING_VERTEX HEX: 8E4F +CONSTANT: GL_TEXTURE_CUBE_MAP_SEAMLESS HEX: 884F + +GL-FUNCTION: void glFramebufferTexture { glFramebufferTextureARB glFramebufferTextureEXT } + ( GLenum target, GLenum attachment, GLuint texture, GLint level ) ; +GL-FUNCTION: void glGetBufferParameteri64v { } + ( GLenum target, GLenum pname, GLint64* params ) ; +GL-FUNCTION: void glGetInteger64i_v { } + ( GLenum target, GLuint index, GLint64* data ) ; +GL-FUNCTION: void glProvokingVertex { } ( GLenum mode ) ; + +GL-FUNCTION: GLsync glFenceSync { } ( GLenum condition, GLbitfield flags ) ; +GL-FUNCTION: GLboolean glIsSync { } ( GLsync sync ) ; +GL-FUNCTION: void glDeleteSync { } ( GLsync sync ) ; +GL-FUNCTION: GLenum glClientWaitSync { } ( GLsync sync, GLbitfield flags, GLuint64 timeout ) ; +GL-FUNCTION: void glWaitSync { } ( GLsync sync, GLbitfield flags, GLuint64 timeout ) ; +GL-FUNCTION: void glGetInteger64v { } ( GLenum pname, GLint64* params ) ; +GL-FUNCTION: void glGetSynciv { } ( GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values ) ; +GL-FUNCTION: void glTexImage2DMultisample { } ( GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations ) ; +GL-FUNCTION: void glTexImage3DMultisample { } ( GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations ) ; +GL-FUNCTION: void glGetMultisamplefv { } ( GLenum pname, GLuint index, GLfloat* val ) ; +GL-FUNCTION: void glSampleMaski { } ( GLuint index, GLbitfield mask ) ; -GL-FUNCTION: void glProgramParameteriEXT { } ( GLuint program, GLenum pname, GLint value ) ; -GL-FUNCTION: void glFramebufferTextureEXT { } ( GLenum target, GLenum attachment, - GLuint texture, GLint level ) ; +! GL_ARB_geometry_shader4 -CONSTANT: GL_GEOMETRY_SHADER_EXT HEX: 8DD9 -CONSTANT: GL_GEOMETRY_VERTICES_OUT_EXT HEX: 8DDA -CONSTANT: GL_GEOMETRY_INPUT_TYPE_EXT HEX: 8DDB -CONSTANT: GL_GEOMETRY_OUTPUT_TYPE_EXT HEX: 8DDC -CONSTANT: GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT HEX: 8C29 -CONSTANT: GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT HEX: 8DDD -CONSTANT: GL_MAX_VERTEX_VARYING_COMPONENTS_EXT HEX: 8DDE -CONSTANT: GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT HEX: 8DDF -CONSTANT: GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT HEX: 8DE0 -CONSTANT: GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT HEX: 8DE1 -CONSTANT: GL_LINES_ADJACENCY_EXT HEX: A -CONSTANT: GL_LINE_STRIP_ADJACENCY_EXT HEX: B -CONSTANT: GL_TRIANGLES_ADJACENCY_EXT HEX: C -CONSTANT: GL_TRIANGLE_STRIP_ADJACENCY_EXT HEX: D -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT HEX: 8DA8 -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT HEX: 8DA9 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT HEX: 8DA7 -CONSTANT: GL_PROGRAM_POINT_SIZE_EXT HEX: 8642 +GL-FUNCTION: void glProgramParameteriARB { glProgramParameteriEXT } + ( GLuint program, GLenum pname, GLint value ) ; +GL-FUNCTION: void glFramebufferTextureLayerARB { glFramebufferTextureLayerEXT } + ( GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer ) ; +GL-FUNCTION: void glFramebufferTextureFaceARB { glFramebufferTextureFaceEXT } + ( GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face ) ; + +CONSTANT: GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB HEX: 8DDD +CONSTANT: GL_MAX_VERTEX_VARYING_COMPONENTS_ARB HEX: 8DDE +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB HEX: 8DA9 ! GL_EXT_framebuffer_object diff --git a/basis/opengl/gl3/gl3.factor b/basis/opengl/gl3/gl3.factor index 2c10e639e5..616049257d 100644 --- a/basis/opengl/gl3/gl3.factor +++ b/basis/opengl/gl3/gl3.factor @@ -727,6 +727,71 @@ ALIAS: GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER gl:GL_UNIFORM_BLOCK_REFERENC ALIAS: GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER gl:GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER ALIAS: GL_INVALID_INDEX gl:GL_INVALID_INDEX +ALIAS: GL_CONTEXT_CORE_PROFILE_BIT gl:GL_CONTEXT_CORE_PROFILE_BIT +ALIAS: GL_CONTEXT_COMPATIBILITY_PROFILE_BIT gl:GL_CONTEXT_COMPATIBILITY_PROFILE_BIT +ALIAS: GL_LINES_ADJACENCY gl:GL_LINES_ADJACENCY +ALIAS: GL_LINE_STRIP_ADJACENCY gl:GL_LINE_STRIP_ADJACENCY +ALIAS: GL_TRIANGLES_ADJACENCY gl:GL_TRIANGLES_ADJACENCY +ALIAS: GL_TRIANGLE_STRIP_ADJACENCY gl:GL_TRIANGLE_STRIP_ADJACENCY +ALIAS: GL_PROGRAM_POINT_SIZE gl:GL_PROGRAM_POINT_SIZE +ALIAS: GL_GEOMETRY_VERTICES_OUT gl:GL_GEOMETRY_VERTICES_OUT +ALIAS: GL_GEOMETRY_INPUT_TYPE gl:GL_GEOMETRY_INPUT_TYPE +ALIAS: GL_GEOMETRY_OUTPUT_TYPE gl:GL_GEOMETRY_OUTPUT_TYPE +ALIAS: GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS gl:GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS +ALIAS: GL_FRAMEBUFFER_ATTACHMENT_LAYERED gl:GL_FRAMEBUFFER_ATTACHMENT_LAYERED +ALIAS: GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS gl:GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS +ALIAS: GL_GEOMETRY_SHADER gl:GL_GEOMETRY_SHADER +ALIAS: GL_MAX_GEOMETRY_UNIFORM_COMPONENTS gl:GL_MAX_GEOMETRY_UNIFORM_COMPONENTS +ALIAS: GL_MAX_GEOMETRY_OUTPUT_VERTICES gl:GL_MAX_GEOMETRY_OUTPUT_VERTICES +ALIAS: GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS gl:GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS +ALIAS: GL_MAX_VERTEX_OUTPUT_COMPONENTS gl:GL_MAX_VERTEX_OUTPUT_COMPONENTS +ALIAS: GL_MAX_GEOMETRY_INPUT_COMPONENTS gl:GL_MAX_GEOMETRY_INPUT_COMPONENTS +ALIAS: GL_MAX_GEOMETRY_OUTPUT_COMPONENTS gl:GL_MAX_GEOMETRY_OUTPUT_COMPONENTS +ALIAS: GL_MAX_FRAGMENT_INPUT_COMPONENTS gl:GL_MAX_FRAGMENT_INPUT_COMPONENTS +ALIAS: GL_CONTEXT_PROFILE_MASK gl:GL_CONTEXT_PROFILE_MASK +ALIAS: GL_MAX_SERVER_WAIT_TIMEOUT gl:GL_MAX_SERVER_WAIT_TIMEOUT +ALIAS: GL_OBJECT_TYPE gl:GL_OBJECT_TYPE +ALIAS: GL_SYNC_CONDITION gl:GL_SYNC_CONDITION +ALIAS: GL_SYNC_STATUS gl:GL_SYNC_STATUS +ALIAS: GL_SYNC_FLAGS gl:GL_SYNC_FLAGS +ALIAS: GL_SYNC_FENCE gl:GL_SYNC_FENCE +ALIAS: GL_SYNC_GPU_COMMANDS_COMPLETE gl:GL_SYNC_GPU_COMMANDS_COMPLETE +ALIAS: GL_UNSIGNALED gl:GL_UNSIGNALED +ALIAS: GL_SIGNALED gl:GL_SIGNALED +ALIAS: GL_ALREADY_SIGNALED gl:GL_ALREADY_SIGNALED +ALIAS: GL_TIMEOUT_EXPIRED gl:GL_TIMEOUT_EXPIRED +ALIAS: GL_CONDITION_SATISFIED gl:GL_CONDITION_SATISFIED +ALIAS: GL_WAIT_FAILED gl:GL_WAIT_FAILED +ALIAS: GL_SYNC_FLUSH_COMMANDS_BIT gl:GL_SYNC_FLUSH_COMMANDS_BIT +ALIAS: GL_TIMEOUT_IGNORED gl:GL_TIMEOUT_IGNORED +ALIAS: GL_SAMPLE_POSITION gl:GL_SAMPLE_POSITION +ALIAS: GL_SAMPLE_MASK gl:GL_SAMPLE_MASK +ALIAS: GL_SAMPLE_MASK_VALUE gl:GL_SAMPLE_MASK_VALUE +ALIAS: GL_MAX_SAMPLE_MASK_WORDS gl:GL_MAX_SAMPLE_MASK_WORDS +ALIAS: GL_TEXTURE_2D_MULTISAMPLE gl:GL_TEXTURE_2D_MULTISAMPLE +ALIAS: GL_PROXY_TEXTURE_2D_MULTISAMPLE gl:GL_PROXY_TEXTURE_2D_MULTISAMPLE +ALIAS: GL_TEXTURE_2D_MULTISAMPLE_ARRAY gl:GL_TEXTURE_2D_MULTISAMPLE_ARRAY +ALIAS: GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY gl:GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY +ALIAS: GL_TEXTURE_BINDING_2D_MULTISAMPLE gl:GL_TEXTURE_BINDING_2D_MULTISAMPLE +ALIAS: GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY gl:GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY +ALIAS: GL_TEXTURE_SAMPLES gl:GL_TEXTURE_SAMPLES +ALIAS: GL_TEXTURE_FIXED_SAMPLE_LOCATIONS gl:GL_TEXTURE_FIXED_SAMPLE_LOCATIONS +ALIAS: GL_SAMPLER_2D_MULTISAMPLE gl:GL_SAMPLER_2D_MULTISAMPLE +ALIAS: GL_INT_SAMPLER_2D_MULTISAMPLE gl:GL_INT_SAMPLER_2D_MULTISAMPLE +ALIAS: GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE gl:GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE +ALIAS: GL_SAMPLER_2D_MULTISAMPLE_ARRAY gl:GL_SAMPLER_2D_MULTISAMPLE_ARRAY +ALIAS: GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY gl:GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY +ALIAS: GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY gl:GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY +ALIAS: GL_MAX_COLOR_TEXTURE_SAMPLES gl:GL_MAX_COLOR_TEXTURE_SAMPLES +ALIAS: GL_MAX_DEPTH_TEXTURE_SAMPLES gl:GL_MAX_DEPTH_TEXTURE_SAMPLES +ALIAS: GL_MAX_INTEGER_SAMPLES gl:GL_MAX_INTEGER_SAMPLES +ALIAS: GL_DEPTH_CLAMP gl:GL_DEPTH_CLAMP +ALIAS: GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION gl:GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION +ALIAS: GL_FIRST_VERTEX_CONVENTION gl:GL_FIRST_VERTEX_CONVENTION +ALIAS: GL_LAST_VERTEX_CONVENTION gl:GL_LAST_VERTEX_CONVENTION +ALIAS: GL_PROVOKING_VERTEX gl:GL_PROVOKING_VERTEX +ALIAS: GL_TEXTURE_CUBE_MAP_SEAMLESS gl:GL_TEXTURE_CUBE_MAP_SEAMLESS + ALIAS: glCullFace gl:glCullFace ALIAS: glFrontFace gl:glFrontFace ALIAS: glHint gl:glHint @@ -1005,3 +1070,19 @@ ALIAS: glGetActiveUniformBlockiv gl:glGetActiveUniformBlockiv ALIAS: glGetActiveUniformBlockName gl:glGetActiveUniformBlockName ALIAS: glUniformBlockBinding gl:glUniformBlockBinding ALIAS: glCopyBufferSubData gl:glCopyBufferSubData +ALIAS: glFramebufferTexture gl:glFramebufferTexture +ALIAS: glGetBufferParameteri64v gl:glGetBufferParameteri64v +ALIAS: glGetInteger64i_v gl:glGetInteger64i_v +ALIAS: glProvokingVertex gl:glProvokingVertex +ALIAS: glFenceSync gl:glFenceSync +ALIAS: glIsSync gl:glIsSync +ALIAS: glDeleteSync gl:glDeleteSync +ALIAS: glClientWaitSync gl:glClientWaitSync +ALIAS: glWaitSync gl:glWaitSync +ALIAS: glGetInteger64v gl:glGetInteger64v +ALIAS: glGetSynciv gl:glGetSynciv +ALIAS: glTexImage2DMultisample gl:glTexImage2DMultisample +ALIAS: glTexImage3DMultisample gl:glTexImage3DMultisample +ALIAS: glGetMultisamplefv gl:glGetMultisamplefv +ALIAS: glSampleMaski gl:glSampleMaski +