Skip to content
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

[GLES] more shader cleanup #13446

Merged
merged 4 commits into from Jan 29, 2018

Conversation

@lrusak
Copy link
Contributor

commented Jan 28, 2018

This has a few purposes:

  1. to align GLES code more similarly with GL code
  2. to allow using glslangValidator more easily as it only accepts .frag and .vert extensions
  3. to prepare for a separate GLES 3.0 code path

git does something funny when displaying the complete diff as it shows some files being removed and some new files being added. This is because the diff only detects the same file if it is 50% or more similar. So when removing the header which is over 50% of the file git thinks the file isn't the same. So I have split the commits into renaming the files, then in another commit changing the contents. If you view the individual commits it show things more clearly. This also allows the git history to be complete. If anyone has any hints or tips about this that would be awesome.

build and runtime tested on GBM but should be worth testing on android and other GLES platforms.

@lrusak lrusak requested a review from FernetMenta Jan 28, 2018
@lrusak lrusak added this to the L 18.0-alpha1 milestone Jan 28, 2018
@ghost

This comment has been minimized.

Copy link

commented Jan 28, 2018

Why is Copyright and licensing being removed from these files ?

@lrusak lrusak force-pushed the lrusak:gles-cleanup-next branch from 3993df0 to eda50e3 Jan 28, 2018
@lrusak

This comment has been minimized.

Copy link
Contributor Author

commented Jan 28, 2018

@MrMC I'm not really sure. I think it had to do with running through the glslangValidator, but it seems to work fine with the headers. I've fixed it.

@ghost

This comment has been minimized.

Copy link

commented Jan 28, 2018

thx, copyright and licensing should never get removed without the consent of the authors.

@lrusak

This comment has been minimized.

Copy link
Contributor Author

commented Jan 28, 2018

Yep sorry, that's my bad

Copy link
Member

left a comment

I think this is ok

@lrusak lrusak merged commit b33ba4d into xbmc:master Jan 29, 2018
1 check passed
1 check passed
default You're awesome. Have a cookie
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.