New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Create missing groups and group annotations #51
Conversation
This is still modifying parameter names for the BlendFuncSeparate* and TexStorageSparse commands - please back those changes out as well. Otherwise it seems OK. It may be simplest to check by generating all the headers and verify that the only differences from upstream are the file-generated dates (then backing the generated files out of the branch before committing, as they tend to cause merge conflicts). |
@oddhack This should have fixed it. |
I found few wrong/incomplete groups at the moment. I'll link my gl.xml file based on this pull request for reference when I'll complete the review of the changes reflected on my projects. Edit: Here is the link. |
OK. I'm on post-meeting vacation now and won't be back for another week or so. |
@luca-piccioni Can I merge your edits in this PR? |
Sure!
Il sab 6 mag 2017, 15:29 Francesco Bertolaccini <notifications@github.com>
ha scritto:
… @luca-piccioni <https://github.com/luca-piccioni> Can I merge your edits
in this PR?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#51 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AEe6CRwEF6kpZmj4kx1KTuII-PlmRsk9ks5r3HW5gaJpZM4NHt3z>
.
|
@oddhack This is ready to be squashed and merged as soon as I receive approval |
@oddhack Little up on this one. I merged the conflicting branches: should I squash now? |
Looks like there's a conflict that needs to be resolved. |
@pdaniell-nv Should be fixed |
Replaces #51 - create missing groups and group annotations
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There were two duplicated group tags, TextureMagFilter and TextureParameterName. I created a new PR #101 which corrected that and merged it, so closing this. Sorry this took so long!
Replaced with #101 |
1456e02 Fix links to EGL registry 02d8c4d Updated GLSL 4.60.4 diff spec b5e957b Merge pull request #119 from KhronosGroup/117-path-rendering 11153e8 Add an issue to NV_path_rendering clarifying that double-precision matrix load support is intentional. 51abb89 Merge branch 'master' into 117-path-rendering eed005c Merge pull request #106 from cubanismo/maintenance2_external_objects_updates 305db78 Add new VK texture layouts to GL_EXT_semaphore e184e2c Reservation for possible future use 72b84d5 Fix merge problem resulting in duplicated parameter tag bdbe42a Merge pull request #100 from nwnk/glxproto 9ec7535 Merge pull request #121 from nhaehnle/ARB_indirect_parameters-COMMAND_BARRIER_BIT 1a27947 ARB_indirect_parameters: add COMMAND_BARRIER_BIT language ca25e74 First cut at fixing #117. Unfortunately, a literal reading of the spec requires adding the double-precision matrix commands to OpenGL ES, which I'm pretty sure is incorrect since OpenGL ES doesn't require support for double precision otherwise. We need to get clarification on this from NVIDIA, so I'll assign this to one of their Khronos people in the hope they will either respond, or pass on to someone who can. f7c8f78 Merge pull request #115 from tate-hornbeck/QCOM_texture_foveated 51120fc Add GL_QCOM_texture_foveated b1e2cb4 Merge pull request #116 from anholt/master 2956d62 MESA_swap_interval: Fix typo of the return value in the XML c6a99af Merge pull request #114 from dgkoch/dgkoch_ovr_mv 82d8c56 Completed OVR_multiview extension 71ec71e Merge pull request #113 from dgkoch/dgkoch_EXT_clip_control_v2 e49da6b Update EXT_clip_control 2ce9bc7 Merge pull request #112 from KhronosGroup/108-cleanup-xml 76235f2 This moves some of the new enum groups introduced in #108 into distinct \<group> tags and removes the value= attributes in those groups, because the scripts don't allow redefining enums (even benignly) inside \<enums> tags. 653f220 Merge pull request #108 from 3b/master dfc257d Merge pull request #105 from anholt/mesa-tile-raster-order 71d495b Add a new MESA_tile_raster_order extension. da83974 make ShaderType group and enums definitions match 73d104f Clarified how gl_LastFragData is populated. 985bb00 Clarified creation of a renderable texture when OES_texture_half_float is supported 420b6bd match text of existing enum defs so final output doesn't change bce9867 don't change function signature 4d711bc remove some non-existent enums from group definitions 2c8fa02 fix typo in DebugSource group definition f63023e comment out enums from group definition when value is commented out 3aabc88 Document GLX protocol for ARB_copy_buffer 96293d9 Document GLX protocol for ARB_texture_buffer_object 300c0b0 Document GLX protocol for ARB_uniform_buffer_object bf1e69d Document GLX protocol for NV_primitive_restart 884451a Document GLX protocol for GL 3.0 4290a0f Document GLX protocol for EXT_draw_buffers2 7abd4a6 Document GLX protocol for OpenGL 2.x 1ad39a8 more group/enums definitions and fixes ff96cbc add more bitfield group annotations and missing group b98d056 Regenerate headers eb71e7e Merge pull request #99 from g-truc/EXT_texture_mirror_clamp_to_edge 2341611 Merge pull request #104 from KhronosGroup/103-blend-color 34ca88a Register GLX_MESA_swap_control, sourced from https://cgit.freedesktop.org/mesa/mesa/tree/docs/specs/MESA_swap_control.spec. Fixes #94. fe16f86 Proposed fix for #103. 93e0595 Merge pull request #101 from KhronosGroup/add_groups f629c67 Replaces KhronosGroup/OpenGL-Registry#51 from @frabert - create missing groups and group annotations, removes duplicate groups that were present in that PR, correct EOL conventions on a few extensions. 9747907 More review feedback 01482de Added review feedback 9198a21 Removed irrelevant copy pasted issue 6240859 Updated EXT_texture_mirror_clamp_to_edge to require OpenGL ES 2.0 instead of OpenGL ES 3.0 24a7023 Added EXT_texture_mirror_clamp_to_edge extension 86be6b7 Update header 1792757 Merge pull request #98 from DominikWitczakAMD/GL_AMD_shader_image_load_store_lod 430861a Publish GL_AMD_shader_image_load_store_lod extension specification 29f29f0 Push index page fix for problem identified in email ffe3c5f Merge pull request #96 from klefebvre/master 1667cf9 new NV memory usage query extension 8735526 Merge pull request #91 from NicolBolas/fix-for-issue-90 11849ca Merge pull request #93 from chadversary/pr/GL_EXT_clip_control b6cd315 Regenerate headers following #76 aa2746d Merge pull request #76 from scott-d-phillips/master f46bf9c GL_EXT_clip_control: New extension a3ee0ed Merge pull request #92 from alegal-arm/master 6008d71 Add GL_KHR_parallel_shader_compile to the registry 9c7efa6 Fix for issue #90. 9df9675 Update header for PR #88 b7ed887 Merge pull request #88 from g-truc/EXT_texture_compression_s3tc_srgb a37e16e Fixed EXT_texture_compression_s3tc_srgb number 11275b0 Merged Khronos/OpenGL-Registry master branch 97909be Update index pages deec25f Tweak ref card links. 0d56f05 Fix index page up for 4.6 706a1fa Fix heading sizes c21e602 OpenGL 4.6 release. b425679 Merge pull request #87 from g-truc/master 26a6d5b Add EXT_texture_compression_s3tc_srgb for ES 1aba102 Fixed docs links on the repository front page. cd8784e Merge pull request #83 from dgkoch/EXT_texture_cmpression_bptc_rgtc 4a123e0 Register EXT_texture_compression_bptc|rgtc for ES 8d90886 Merge pull request #84 from dgkoch/add_NV_pixel_buffer_object acab4af Merge pull request #85 from Frassle/issue78 07f145a Merge pull request #86 from jackohound/clarify_EXT_EGL_image_array_extension 32f1bd9 Fix extension reference in EXT_EGL_image_array 591f940 Change glGetShaderPrecisionFormat precision parameter len attribute to 1 75de98a Add NV_pixel_buffer_object to gl.xml 8d92dbf Remove extraneous H1 headers d16c0a8 Remove extraneous H1 headers 941bd81 Remove extraneous H1 headers e2bfdac Remove extraneous H1 headers 07b8390 Add GL_NV_blend_minmax_factor.txt per KhronosGroup/OpenGL-API#8 . fb6a87e Add GL_NV_blend_minmax_factor See KhronosGroup/OpenGL-API#8 3d5186c Merge pull request #82 from imirkin/master 7837907 Fix suffix for glMultiDrawElementsBaseVertex c5c5c98 Clarify Blit and Clear behaviours, and fixed framebuffer attachment binding psuedocode (bugzillas 16173, 16174, 16176) (#80) 6399c86 Merge pull request #75 from lostgoat/external-objects-fixes 94fcd50 Add types to GLES/gl.h for backwards compatibility 9755811 Merge pull request #74 from alegal-arm/master 21d0ecf Update GL 4.5 API and GLSL 4.50 specs 37f1c38 Fix missing EXT suffix in some mentions of GetUnsignedByte* 7ac9c85 Un-alias functions introduced by OES_texture_3D from the core counterparts 73ac935 Fix typo in MemoryObjectParameterivEXT git-subtree-dir: :KhronosGroup/OpenGL-Registry git-subtree-split: 1456e02f15738f04782e8c952ff5ace48b667a0a
@frabert - create missing groups and group annotations, removes duplicate groups that were present in that PR, correct EOL conventions on a few extensions.
This pull request aims to replace PR #45 which had unwanted side-effects. This time the only additions are new groups and new values to existing groups. Where possibile, I have kept the existing group names when they had proprietary suffixes (i.e.
BufferAccessARB
) even if used in non-extension methods (glMapBuffer
).I will wait for the mantainers' consent before squashing the commits