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

Add OpenGL 4.6 support. #89

Merged
merged 2 commits into from Nov 10, 2017

Conversation

Projects
None yet
2 participants
@kjozic
Contributor

kjozic commented Nov 7, 2017

No description provided.

@dmitshur

This comment has been minimized.

Show comment
Hide comment
@dmitshur

dmitshur Nov 8, 2017

Member

Thanks for doing this.

How did you make this change? How can I reproduce it and verify these changes are correct?

Member

dmitshur commented Nov 8, 2017

Thanks for doing this.

How did you make this change? How can I reproduce it and verify these changes are correct?

@kjozic

This comment has been minimized.

Show comment
Hide comment
@kjozic

kjozic Nov 8, 2017

Contributor

The procedure is straightforward:

  1. Fork both gl and glow repositories
  2. Create a new branch in each repository
  3. Download the files mentioned in the issue "OpenGL 4.6 support" (gl repo) and put them into glow/xml/spec folder
  4. Switch to gl folder and run following commands:
glow generate -out=./v4.6-core/gl/ -api=gl -version=4.6 -profile=core -xml=../glow/xml/
glow generate -out=./v4.6-compatibility/gl/ -api=gl -version=4.6 -profile=compatibility -xml=../glow/xml/
  1. Commit the changes and create the pull requests
  2. Repo gl uses Travis CI for continuous integration; glow does not use CI (it just checks for the merge conflicts)
Contributor

kjozic commented Nov 8, 2017

The procedure is straightforward:

  1. Fork both gl and glow repositories
  2. Create a new branch in each repository
  3. Download the files mentioned in the issue "OpenGL 4.6 support" (gl repo) and put them into glow/xml/spec folder
  4. Switch to gl folder and run following commands:
glow generate -out=./v4.6-core/gl/ -api=gl -version=4.6 -profile=core -xml=../glow/xml/
glow generate -out=./v4.6-compatibility/gl/ -api=gl -version=4.6 -profile=compatibility -xml=../glow/xml/
  1. Commit the changes and create the pull requests
  2. Repo gl uses Travis CI for continuous integration; glow does not use CI (it just checks for the merge conflicts)
Download latest XML via glow download command.
This correctly updates the REVISION file to state the revision used.
It also updates files in xml/doc directory.
@dmitshur

This comment has been minimized.

Show comment
Hide comment
@dmitshur

dmitshur Nov 10, 2017

Member

Thanks.

After looking more into it, I found there's a command in glow to download updated XML files:

$ glow
Usage: glow command [arguments]
Commands:
  download  Downloads specification and documentation XML files
  generate  Generates bindings
Use glow <command> -help for a detailed command description

It also downloads new files in xml/doc directory.

$ glow download
2017/11/09 19:51:41 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml
2017/11/09 19:51:41 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml
2017/11/09 19:51:41 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/egl.xml
2017/11/09 19:51:41 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/glx.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glActiveTexture.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glBindBuffer.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glBeginQuery.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glAlphaFunc.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glAreTexturesResident.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glArrayElement.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glAttachShader.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glAccum.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glBegin.xml
...

I'll push a commit to apply that change.

Member

dmitshur commented Nov 10, 2017

Thanks.

After looking more into it, I found there's a command in glow to download updated XML files:

$ glow
Usage: glow command [arguments]
Commands:
  download  Downloads specification and documentation XML files
  generate  Generates bindings
Use glow <command> -help for a detailed command description

It also downloads new files in xml/doc directory.

$ glow download
2017/11/09 19:51:41 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml
2017/11/09 19:51:41 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml
2017/11/09 19:51:41 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/egl.xml
2017/11/09 19:51:41 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/glx.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glActiveTexture.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glBindBuffer.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glBeginQuery.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glAlphaFunc.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glAreTexturesResident.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glArrayElement.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glAttachShader.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glAccum.xml
2017/11/09 19:51:44 Downloading https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/man2/glBegin.xml
...

I'll push a commit to apply that change.

@dmitshur

LGTM. Thanks!

@dmitshur dmitshur merged commit 38ff642 into go-gl:master Nov 10, 2017

@dmitshur

This comment has been minimized.

Show comment
Hide comment
@dmitshur

dmitshur Nov 10, 2017

Member

Looks like I jumped too quickly with this. It seems the latest XML files from that cvs source do not yet contain definitions for OpenGL 4.6. That's why you used a difference source in go-gl/gl#88 (comment).

So, this PR, as merged, is not sufficient to add OpenGL 4.6 support.

Any ideas why https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/master/xml/gl.xml contains 4.6 but not https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml?

Member

dmitshur commented Nov 10, 2017

Looks like I jumped too quickly with this. It seems the latest XML files from that cvs source do not yet contain definitions for OpenGL 4.6. That's why you used a difference source in go-gl/gl#88 (comment).

So, this PR, as merged, is not sufficient to add OpenGL 4.6 support.

Any ideas why https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/master/xml/gl.xml contains 4.6 but not https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml?

@dmitshur

This comment has been minimized.

Show comment
Hide comment
@dmitshur

dmitshur Nov 10, 2017

Member

I'm going to revert what I merged for now, because the commit message is too misleading. That change updates to latest XML from our cvs source, but it doesn't add OpenGL 4.6 support. We should figure out what to do. /cc @errcw

I don't want to regenerate gl repo, and I don't want it to be out of date with glow, so reverting is the best action for now. Re-apply this will be trivial once we figure out what to do.

Member

dmitshur commented Nov 10, 2017

I'm going to revert what I merged for now, because the commit message is too misleading. That change updates to latest XML from our cvs source, but it doesn't add OpenGL 4.6 support. We should figure out what to do. /cc @errcw

I don't want to regenerate gl repo, and I don't want it to be out of date with glow, so reverting is the best action for now. Re-apply this will be trivial once we figure out what to do.

dmitshur added a commit that referenced this pull request Nov 10, 2017

Revert "Add OpenGL 4.6 support. (#89)"
This reverts commit 38ff642.

That change updates to latest XML from our cvs source, but it doesn't
add OpenGL 4.6 support. We need to figure out how to best proceed.
I don't want the gl repo to be out of sync regarding glow, so reverting
for now.

See #89 (comment).

@dmitshur dmitshur referenced this pull request Nov 10, 2017

Closed

OpenGL 4.6 support. #90

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment